# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1083359405 0
# Node ID 04a44f089cc172184aba165be5b2f01ca4da3f75
# Parent  c4d464135bfcd0cbc1d7f7895a8ad597448f18b1
(smerge-diff-switches): Fix typo in docstring.

diff -r c4d464135bfc -r 04a44f089cc1 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Fri Apr 30 21:06:00 2004 +0000
+++ b/lisp/smerge-mode.el	Fri Apr 30 21:10:05 2004 +0000
@@ -65,7 +65,7 @@
 (defcustom smerge-diff-switches
   (append '("-d" "-b")
 	  (if (listp diff-switches) diff-switches (list diff-switches)))
-  "*A list of strings specifying switches to be be passed to diff.
+  "*A list of strings specifying switches to be passed to diff.
 Used in `smerge-diff-base-mine' and related functions."
   :group 'smerge
   :type '(repeat string))
@@ -324,7 +324,7 @@
 	      ;; Out of range
 	      (popup-menu smerge-mode-menu)
 	    ;; Install overlay.
-	    (setq o (make-overlay (match-beginning i) (match-end i)))  
+	    (setq o (make-overlay (match-beginning i) (match-end i)))
 	    (unwind-protect
 		(progn
 		  (overlay-put o 'face 'highlight)
@@ -512,7 +512,7 @@
 	    (unwind-protect
 		(add-text-properties start end smerge-text-properties)
 	      (restore-buffer-modified-p m)))
-              
+
 	  (store-match-data (list start end
 				  mine-start mine-end
 				  base-start base-end