| commit | 8c91d31beab0234e8a187864df46af543022c656 | |
| author | Glenn Morris <rgm@gnu.org> | |
| Wed, 13 Dec 2017 02:58:38 +0000 (12 21:58 -0500) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Wed, 13 Dec 2017 02:58:38 +0000 (12 21:58 -0500) | ||
| tree | 5e8bc381f73554660eb1f26a8e90c42ce32239a4 | treesnapshot (tar.gz zip) |
| parent | 8e78d49765993bbbb93d42b0530f5ffaa4e759f4 | commitdiff |
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 (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 | diffblobblamehistory |