diff options
| -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." | |||
| 400 | "\n - You can safely close this Emacs session and do this " | 400 | "\n - You can safely close this Emacs session and do this " |
| 401 | "in a new one." | 401 | "in a new one." |
| 402 | "\n - When running gitmerge again, remember that you must " | 402 | "\n - When running gitmerge again, remember that you must " |
| 403 | "that from within the Emacs repo.\n") | 403 | "do that from within the Emacs repo.\n") |
| 404 | (pop-to-buffer (current-buffer))) | 404 | (pop-to-buffer (current-buffer))) |
| 405 | (user-error "Resolve the conflicts manually")))))) | 405 | (user-error "Resolve the conflicts manually")))))) |
| 406 | 406 | ||