]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8e78d49) | patch
Fix gitmerge handling of automatic conflict reslution
authorGlenn Morris <rgm@gnu.org>
Wed, 13 Dec 2017 02:58:38 +0000 (21:58 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 13 Dec 2017 02:58:38 +0000 (21:58 -0500)
commit8c91d31beab0234e8a187864df46af543022c656
tree5e8bc381f73554660eb1f26a8e90c42ce32239a4tree | snapshot
parent8e78d49765993bbbb93d42b0530f5ffaa4e759f4commit | diff
Fix gitmerge handling of automatic conflict reslution

* admin/gitmerge.el (gitmerge-resolve): Reenable NEWS handling.
(gitmerge-resolve-unmerged): Commit after successful resolution.
(gitmerge-commit): New function, extracted from gitmerge-maybe-resume.
(gitmerge-maybe-resume): Use gitmerge-commit.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.