diff options
| author | Joakim Verona <joakim@verona.se> | 2012-03-25 22:04:52 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2012-03-25 22:04:52 +0200 |
| commit | 75da28a3845b9dfa4e730cfa19c14edc52cbb222 (patch) | |
| tree | b04519bffcb21264cbe3ce8af13df7186548667f /lisp/vc/vc.el | |
| parent | b827329a89291ed68dd017c53976be7ce5ed3b22 (diff) | |
| parent | f514f6f0e3f8bbeb5212d0337e5bda5a9a4eaeb5 (diff) | |
| download | emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.tar.gz emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.tar.bz2 emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.zip | |
upstream
Diffstat (limited to 'lisp/vc/vc.el')
| -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." (setq first-revision (vc-read-revision (concat "Merge " file - "from branch or revision " + " from branch or revision " "(default news on current branch): ") (list file) backend)) |