[Emacs-diffs] emacs-26 6c30313: * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.

[Glenn Morris]

branch: emacs-26
commit 6c3031399b796feceaab2bdfe94abe7170db4e34
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.
---
 admin/gitmerge.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 0dfd190..9ea94b7 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"))))))