diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-08-16 19:51:55 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-08-16 19:51:55 +0000 |
| commit | 4a1066f09d0b34309522588d9e47a23a2c9971b9 (patch) | |
| tree | d1f7314792e45c3b0cdef6f5a35d3deaf09c775f /lisp/smerge-mode.el | |
| parent | 520557251e16481703b2de6797d49ab29519245d (diff) | |
| download | emacs-4a1066f09d0b34309522588d9e47a23a2c9971b9.tar.gz | |
(smerge-mode-menu): Doc fix.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 10 |
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. ;; |