]> code.delx.au - gnu-emacs/commitdiff
(vc-svn-merge): Forgot quotes.
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 5 May 2003 16:13:39 +0000 (16:13 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 5 May 2003 16:13:39 +0000 (16:13 +0000)
lisp/vc-svn.el

index 571f5c8d030060071225d4fde54b102e5c5f7123..e5cf1fbd0fff799898df9aacebe2e190af08bff9 100644 (file)
@@ -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)