From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 16 Aug 2000 19:51:55 +0000 (+0000)
Subject: (smerge-mode-menu): Doc fix.
X-Git-Tag: emacs-pretest-21.0.90~2250
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=394bd1cae106e1ab1aa41691a4b80179424d1a5a;p=emacs.git

(smerge-mode-menu): Doc fix.
---

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.
 ;;