From 6c3031399b796feceaab2bdfe94abe7170db4e34 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Nov 2017 15:36:45 -0500 Subject: [PATCH] * 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 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")))))) -- 2.39.5