diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-11-08 15:36:45 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-11-08 15:36:45 -0500 |
| commit | 6c3031399b796feceaab2bdfe94abe7170db4e34 (patch) | |
| tree | 5abb67b70cdcc6b3dc7f38bed83c53dfe58f0937 | |
| parent | 98288ecaffbc0947ec3193088172ea85ad5e42a5 (diff) | |
| download | emacs-6c3031399b796feceaab2bdfe94abe7170db4e34.tar.gz | |
* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.
| -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 0dfd190d753..9ea94b71e0f 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")))))) |