diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
| commit | 8d99e233147d44c2176cef599db754d06b12f5e3 (patch) | |
| tree | 1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6 /admin/gitmerge.el | |
| parent | d5ccb74848658d20a7b31ea3a2bf5a090468fd5d (diff) | |
| parent | 6c3031399b796feceaab2bdfe94abe7170db4e34 (diff) | |
| download | emacs-8d99e233147d44c2176cef599db754d06b12f5e3.tar.gz | |
Merge from origin/emacs-26
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index fa8c9c0f3de..b9b511fbee2 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")))))) |