Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
02610d0e
Commit
02610d0e
authored
May 05, 2003
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(vc-svn-merge): Forgot quotes.
parent
c217cb04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lisp/vc-svn.el
lisp/vc-svn.el
+1
-1
No files found.
lisp/vc-svn.el
View file @
02610d0e
...
...
@@ -329,7 +329,7 @@ This is only possible if SVN is responsible for FILE's directory.")
The changes are between FIRST-VERSION and SECOND-VERSION."
(
vc-svn-command
nil
0
file
"merge"
-r
(
if
second-version
"
-r
"
(
if
second-version
(
concat
first-version
":"
second-version
)
first-version
))
(
vc-file-setprop
file
'vc-state
'edited
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment