| commit | dbd65c779aa648bcc5c6fdc31f0be44cce4ea8ce | |
| author | Dmitry Gutov <dgutov@yandex.ru> | |
| Wed, 22 Apr 2015 01:45:43 +0000 (22 04:45 +0300) | ||
| committer | Dmitry Gutov <dgutov@yandex.ru> | |
| Wed, 22 Apr 2015 01:59:48 +0000 (22 04:59 +0300) | ||
| tree | 185fcc46c6d325cc994535bd935b0f873f4223cc | treesnapshot (tar.gz zip) |
| parent | 3f2c8b82649b670bdccfdc2235b3fb0b63a90d4c | commitdiff |
Add or reset based on the presence of MERGE_HEAD
* lisp/vc/vc-git.el (vc-git-find-file-hook): Add
`vc-git-resolve-when-done' to `after-save-hook' in either case.
(vc-git-conflicted-files): Add a TODO.
(vc-git-resolve-when-done): Depending on the presence of
MERGE_HEAD, either update the resolved file in the index, or
remove it from there. (Bug#20292)
* lisp/vc/vc-git.el (vc-git-find-file-hook): Add
`vc-git-resolve-when-done' to `after-save-hook' in either case.
(vc-git-conflicted-files): Add a TODO.
(vc-git-resolve-when-done): Depending on the presence of
MERGE_HEAD, either update the resolved file in the index, or
remove it from there. (Bug#20292)
| lisp/vc/vc-git.el | diffblobblamehistory |