diff options
| author | Dmitry Gutov | 2015-05-16 16:14:01 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-05-16 16:14:01 +0300 |
| commit | 45651154473c7d2f16230da765d034ecfde7968a (patch) | |
| tree | ad85b5d780fbb252a07bcfacf5be207aa929be97 /admin/notes | |
| parent | 0d3451c75dcdc52948caf5c464feada7280c64c1 (diff) | |
| download | emacs-45651154473c7d2f16230da765d034ecfde7968a.tar.gz emacs-45651154473c7d2f16230da765d034ecfde7968a.zip | |
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)
Diffstat (limited to 'admin/notes')
0 files changed, 0 insertions, 0 deletions