diff options
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)) |