From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 29 Nov 2014 07:54:57 +0000 (-0800)
Subject: Spelling fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~305
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dbff8fd118824163f4d2780fa8566cf92e1d8e86;p=emacs.git

Spelling fix.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 88c633393a6..d2f906806c8 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -157,7 +157,7 @@ Auto-commit"
 	  (delete-char 1)
 	  (insert (if skip "M" " "))
 	  (setq buffer-read-only t))))))
-	  
+
 (defun gitmerge-highlight-skip-regexp ()
   "Highlight strings that match `gitmerge-skip-regexp'."
   (save-excursion
@@ -361,7 +361,7 @@ Throw an user-error if we cannot resolve automatically."
 	(goto-char (point-min))
 	(while (not (eobp))
 	  (push (buffer-substring (point) (line-end-position)) files)
-	  (forward-line))      
+	  (forward-line))
 	(dolist (file files)
 	  (if (gitmerge-resolve file)
 	      ;; File still has conflicts
@@ -393,7 +393,7 @@ Throw an user-error if we cannot resolve automatically."
       (call-process "git" nil t nil
 		    "diff" "--name-only")
       (zerop (buffer-size))))
-  
+
 (defun gitmerge-maybe-resume ()
   "Check if we have to resume a merge.
 If so, add no longer conflicted files and commit."
@@ -420,7 +420,7 @@ If so, add no longer conflicted files and commit."
 	    (unless (zerop (call-process "git" nil t nil
 					 "commit" "--no-edit"))
 	      (error "Git error during merge - fix it manually"))))
-	;; Sucesfully resumed.
+	;; Successfully resumed.
 	t))))
 
 (defun gitmerge-get-all-branches ()