From: Glenn Morris <rgm@gnu.org>
Date: Wed, 8 Nov 2017 20:36:45 +0000 (-0500)
Subject: * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.
X-Git-Tag: emacs-26.0.91~352
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c3031399b;p=emacs.git

* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 0dfd190d753..9ea94b71e0f 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -400,7 +400,7 @@ Throw an user-error if we cannot resolve automatically."
 		    "\n  - You can safely close this Emacs session and do this "
 		    "in a new one."
 		    "\n  - When running gitmerge again, remember that you must "
-		    "that from within the Emacs repo.\n")
+		    "do that from within the Emacs repo.\n")
 	    (pop-to-buffer (current-buffer)))
 	  (user-error "Resolve the conflicts manually"))))))