[Emacs-diffs] Changes to emacs/lisp/vc-svn.el

[Stefan Monnier]

Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.4 emacs/lisp/vc-svn.el:1.5
*** emacs/lisp/vc-svn.el:1.4    Mon May  5 12:13:04 2003
--- emacs/lisp/vc-svn.el        Mon May  5 12:13:39 2003
***************
*** 329,335 ****
  The changes are between FIRST-VERSION and SECOND-VERSION."
    (vc-svn-command nil 0 file
                   "merge"
!                -r (if second-version
                        (concat first-version ":" second-version)
                      first-version))
    (vc-file-setprop file 'vc-state 'edited)
--- 329,335 ----
  The changes are between FIRST-VERSION and SECOND-VERSION."
    (vc-svn-command nil 0 file
                   "merge"
!                "-r" (if second-version
                        (concat first-version ":" second-version)
                      first-version))
    (vc-file-setprop file 'vc-state 'edited)