diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/vc/smerge-mode.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 9f9224c226c..e9bfffd0354 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -735,17 +735,17 @@ major modes. Uses `smerge-resolve-function' to do the actual work." (smerge-auto-leave)))))) (defun smerge-diff-base-mine () - "Diff 'base' and 'mine' version in current conflict region." + "Diff `base' and `mine' version in current conflict region." (interactive) (smerge-diff 2 1)) (defun smerge-diff-base-other () - "Diff 'base' and 'other' version in current conflict region." + "Diff `base' and `other' version in current conflict region." (interactive) (smerge-diff 2 3)) (defun smerge-diff-mine-other () - "Diff 'mine' and 'other' version in current conflict region." + "Diff `mine' and `other' version in current conflict region." (interactive) (smerge-diff 1 3)) |