diff options
| author | Mauro Aranda <maurooaranda@gmail.com> | 2025-03-17 06:55:07 -0300 |
|---|---|---|
| committer | Mauro Aranda <maurooaranda@gmail.com> | 2025-03-17 06:55:07 -0300 |
| commit | acb96a5ca8ac3bef80ca2ff1496cacb3ab57c87a (patch) | |
| tree | 5d8054c7b153f16f9c4bf32efeda81d165dafcd8 /lisp/emacs-lisp/byte-run.el | |
| parent | 86be9431ae88126387ed8402cb4953963ebba6f8 (diff) | |
| download | emacs-acb96a5ca8ac3bef80ca2ff1496cacb3ab57c87a.tar.gz emacs-acb96a5ca8ac3bef80ca2ff1496cacb3ab57c87a.tar.bz2 emacs-acb96a5ca8ac3bef80ca2ff1496cacb3ab57c87a.zip | |
Make marking conflicted files as resolved upon saving opt-out
This fixes Bug#3860.
* lisp/vc/vc.el (vc-resolve-conflicts): New user option.
* lisp/vc/vc-bzr.el (vc-bzr-resolve-conflicts): New user option.
(vc-bzr-find-file-hook): Use it.
* lisp/vc/vc-hg.el (vc-hg-resolve-conflicts): New user option.
(vc-hg-find-file-hook): Use it.
* lisp/vc/vc-svn.el (vc-svn-resolve-conflicts): New user option.
(vc-svn-find-file-hook): Use it.
* lisp/vc/vc-git.el (vc-git-resolve-conflicts): Support
'default' as an option. Adjust docstring and version.
(vc-git-find-file-hook): Respect vc-resolve-conflicts.
* etc/NEWS: Announce the new options.
Diffstat (limited to 'lisp/emacs-lisp/byte-run.el')
0 files changed, 0 insertions, 0 deletions