diff options
| author | Stefan Monnier | 2003-05-05 16:13:39 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2003-05-05 16:13:39 +0000 |
| commit | 02610d0eee34796a6956c8b8dfe546ac675b04a8 (patch) | |
| tree | 02066e2b47243cbe24dbece644fb5f02ca2d25b0 | |
| parent | c217cb045280290f1cf77bdd3fe864ee8bd8b76c (diff) | |
| download | emacs-02610d0eee34796a6956c8b8dfe546ac675b04a8.tar.gz emacs-02610d0eee34796a6956c8b8dfe546ac675b04a8.zip | |
(vc-svn-merge): Forgot quotes.
| -rw-r--r-- | lisp/vc-svn.el | 2 |
1 files changed, 1 insertions, 1 deletions
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.") | |||
| 329 | The changes are between FIRST-VERSION and SECOND-VERSION." | 329 | The changes are between FIRST-VERSION and SECOND-VERSION." |
| 330 | (vc-svn-command nil 0 file | 330 | (vc-svn-command nil 0 file |
| 331 | "merge" | 331 | "merge" |
| 332 | -r (if second-version | 332 | "-r" (if second-version |
| 333 | (concat first-version ":" second-version) | 333 | (concat first-version ":" second-version) |
| 334 | first-version)) | 334 | first-version)) |
| 335 | (vc-file-setprop file 'vc-state 'edited) | 335 | (vc-file-setprop file 'vc-state 'edited) |