Commit 6c303139 authored by Glenn Morris's avatar Glenn Morris

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

parent 98288eca
......@@ -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"))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment