| commit | 45651154473c7d2f16230da765d034ecfde7968a | |
| author | Dmitry Gutov <dgutov@yandex.ru> | |
| Sat, 16 May 2015 13:14:01 +0000 (16 16:14 +0300) | ||
| committer | Dmitry Gutov <dgutov@yandex.ru> | |
| Sat, 16 May 2015 13:14:01 +0000 (16 16:14 +0300) | ||
| tree | ad85b5d780fbb252a07bcfacf5be207aa929be97 | treesnapshot (tar.gz zip) |
| parent | 0d3451c75dcdc52948caf5c464feada7280c64c1 | commitdiff |
Add new option vc-git-resolve-conflicts
* lisp/vc/vc-git.el (vc-git-resolve-conflicts): New variable.
(vc-git-find-file-hook): Add to after-save-hook only when the
above is non-nil.
(vc-git-resolve-when-done): Update to honor the new variable.
(Bug#20292)
* lisp/vc/vc-git.el (vc-git-resolve-conflicts): New variable.
(vc-git-find-file-hook): Add to after-save-hook only when the
above is non-nil.
(vc-git-resolve-when-done): Update to honor the new variable.
(Bug#20292)
| lisp/vc/vc-git.el | diffblobblamehistory |