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

2017-11-08 15:36:45 -05:00
parent 98288ecaff
commit 6c3031399b
1 changed files with 1 additions and 1 deletions
--- 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"))))))