From: Stefan Monnier Date: Mon, 5 May 2003 16:13:39 +0000 (+0000) Subject: (vc-svn-merge): Forgot quotes. X-Git-Tag: ttn-vms-21-2-B4~10315 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=02610d0eee34796a6956c8b8dfe546ac675b04a8;p=emacs.git (vc-svn-merge): Forgot quotes. --- diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 571f5c8d030..e5cf1fbd0ff 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -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)