# HG changeset patch # User Stefan Monnier # Date 1052151219 0 # Node ID 83c8010f1eb2448c07cb457af58366258ca8a3c1 # Parent 0be6233722ec70c4cce9d3e1f49db1a4ae0c301b (vc-svn-merge): Forgot quotes. diff -r 0be6233722ec -r 83c8010f1eb2 lisp/vc-svn.el --- 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)