Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
6c303139
Commit
6c303139
authored
Nov 08, 2017
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.
parent
98288eca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
admin/gitmerge.el
admin/gitmerge.el
+1
-1
No files found.
admin/gitmerge.el
View file @
6c303139
...
...
@@ -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"
))))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment