diff options
| author | Simon Leinen | 2012-03-24 21:23:23 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-24 21:23:23 +0800 |
| commit | 6e7e90fa24df8bddeab77f9846d74e06f75ed9bc (patch) | |
| tree | 82af6dd112d0b466aef50aefeeece848df1a568b /lisp/vc | |
| parent | f06e2758ba96694f76389a65f7395dbae557ba73 (diff) | |
| download | emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.tar.gz emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.zip | |
* vc/vc.el (vc-merge): Fix a prompt.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index e1141cb392d..4cbbf47c2d6 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1922,7 +1922,7 @@ changes from the current branch." | |||
| 1922 | (setq first-revision | 1922 | (setq first-revision |
| 1923 | (vc-read-revision | 1923 | (vc-read-revision |
| 1924 | (concat "Merge " file | 1924 | (concat "Merge " file |
| 1925 | "from branch or revision " | 1925 | " from branch or revision " |
| 1926 | "(default news on current branch): ") | 1926 | "(default news on current branch): ") |
| 1927 | (list file) | 1927 | (list file) |
| 1928 | backend)) | 1928 | backend)) |