mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Glenn Morris 2017-11-08 15:36:45 -05:00
parent 98288ecaff
commit 6c3031399b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -400,7 +400,7 @@ Throw an user-error if we cannot resolve automatically."
"\n - You can safely close this Emacs session and do this " "\n - You can safely close this Emacs session and do this "
"in a new one." "in a new one."
"\n - When running gitmerge again, remember that you must " "\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))) (pop-to-buffer (current-buffer)))
(user-error "Resolve the conflicts manually")))))) (user-error "Resolve the conflicts manually"))))))