admin/gitmerge.el · 8c91d31beab0234e8a187864df46af543022c656 · emacs / emacs

Fix gitmerge handling of automatic conflict reslution · 8c91d31b

Glenn Morris authored Dec 12, 2017

* 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.

8c91d31b

gitmerge.el 21.5 KB

Replace gitmerge.el