]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0d3451c) | patch
Add new option vc-git-resolve-conflicts
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 16 May 2015 13:14:01 +0000 (16:14 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 16 May 2015 13:14:01 +0000 (16:14 +0300)
commit45651154473c7d2f16230da765d034ecfde7968a
treead85b5d780fbb252a07bcfacf5be207aa929be97tree | snapshot
parent0d3451c75dcdc52948caf5c464feada7280c64c1commit | diff
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 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.