Mercurial > emacs
changeset 50823:83c8010f1eb2
(vc-svn-merge): Forgot quotes.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 05 May 2003 16:13:39 +0000 |
parents | 0be6233722ec |
children | 6ec8ac2993aa |
files | lisp/vc-svn.el |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-svn.el Mon May 05 16:13:04 2003 +0000 +++ b/lisp/vc-svn.el Mon May 05 16:13:39 2003 +0000 @@ -329,7 +329,7 @@ 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)