diff options
| author | Glenn Morris | 2017-12-12 21:58:38 -0500 |
|---|---|---|
| committer | Glenn Morris | 2017-12-12 21:58:38 -0500 |
| commit | 8c91d31beab0234e8a187864df46af543022c656 (patch) | |
| tree | 5e8bc381f73554660eb1f26a8e90c42ce32239a4 /lisp/progmodes/python.el | |
| parent | 8e78d49765993bbbb93d42b0530f5ffaa4e759f4 (diff) | |
| download | emacs-8c91d31beab0234e8a187864df46af543022c656.tar.gz emacs-8c91d31beab0234e8a187864df46af543022c656.zip | |
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.
Diffstat (limited to 'lisp/progmodes/python.el')
0 files changed, 0 insertions, 0 deletions