summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2000-08-16 19:51:55 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2000-08-16 19:51:55 +0000
commit394bd1cae106e1ab1aa41691a4b80179424d1a5a (patch)
treea736187c8513c8f6e91c9d6e39b595e64aab3cee /lisp/smerge-mode.el
parentef94046937954c157ddd87584d29b2f7b9d7c628 (diff)
downloademacs-394bd1cae106e1ab1aa41691a4b80179424d1a5a.tar.gz
(smerge-mode-menu): Doc fix.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r--lisp/smerge-mode.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 5e56137bf07..be3887c032c 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.3 2000/05/25 18:08:26 fx Exp $
+;; Revision: $Id: smerge-mode.el,v 1.4 2000/07/21 13:52:19 fx Exp $
;; This file is part of GNU Emacs.
@@ -127,13 +127,12 @@ Used in `smerge-diff-base-mine' and related functions."
"Menu for `smerge-mode'."
'("SMerge"
["Next" smerge-next :help "Go to next conflict"]
- ["Previous" smerge-prev :help "Go to previous'th conflict"]
+ ["Previous" smerge-prev :help "Go to previous conflict"]
["Keep All" smerge-keep-all :help "Keep all three versions"]
["Revert to Base" smerge-keep-base :help "Revert to base version"]
["Keep Other" smerge-keep-other :help "Keep `other' version"]
["Keep Yours" smerge-keep-mine :help "Keep your version"]
- ["Keep Current" smerge-keep-current
- :help "Use current (at point) version"]
+ ["Keep Current" smerge-keep-current :help "Use current (at point) version"]
"--"
["Diff Base/Mine" smerge-diff-base-mine
:help "Diff `base' and `mine' for current conflict"]
@@ -461,6 +460,9 @@ The point is moved to the end of the conflict."
;;; Change Log:
;; $Log: smerge-mode.el,v $
+;; Revision 1.4 2000/07/21 13:52:19 fx
+;; (smerge-mode-menu): Fill it out.
+;;
;; Revision 1.3 2000/05/25 18:08:26 fx
;; (smerge-diff-switches): Don't use list* in defcustom.
;;