Mauro Aranda acb96a5ca8 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.		2025-03-17 06:55:07 -03:00
..
add-log.el	Revert "Correctly fill generated ChangeLog entries"	2025-02-26 07:22:27 +01:00
compare-w.el
cvs-status.el
diff-mode.el	Teach diff-apply-hunk to handle hunks with empty context	2025-03-15 04:54:11 +02:00
diff.el	Merge from origin/emacs-30	2025-03-01 10:01:54 -05:00
ediff-diff.el
ediff-help.el
ediff-hook.el
ediff-init.el
ediff-merg.el
ediff-mult.el	Guard against user saving ediff-meta-diff-buffer	2025-03-09 08:10:17 -03:00
ediff-ptch.el	Prefer '(evenp A)' to '(= 0 (% A 2))'	2025-02-17 05:37:10 +01:00
ediff-util.el
ediff-vers.el	Fix unwanted revert file prompt after repeated vc-ediff (bug#11605)	2025-03-04 11:58:15 +08:00
ediff-wind.el
ediff.el
emerge.el
log-edit.el	; Add comment to explain recent change	2025-03-10 20:35:28 +01:00
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el	Prefer decf to cl-decf	2025-02-23 00:38:22 +01:00
pcvs.el
smerge-mode.el	Prefer decf to cl-decf	2025-02-23 00:38:22 +01:00
vc-annotate.el
vc-bzr.el	Make marking conflicted files as resolved upon saving opt-out	2025-03-17 06:55:07 -03:00
vc-cvs.el	Delete redundant lambdas around unary functions	2025-02-11 19:04:00 +01:00
vc-dav.el
vc-dir.el
vc-dispatcher.el	vc-setup-buffer: Don't set current buffer as parent (bug#59457)	2025-03-10 17:14:33 +08:00
vc-filewise.el
vc-git.el	Make marking conflicted files as resolved upon saving opt-out	2025-03-17 06:55:07 -03:00
vc-hg.el	Make marking conflicted files as resolved upon saving opt-out	2025-03-17 06:55:07 -03:00
vc-hooks.el	Use defvar-keymap for some trivial keymaps	2025-03-16 13:48:11 +01:00
vc-rcs.el
vc-sccs.el
vc-src.el
vc-svn.el	Make marking conflicted files as resolved upon saving opt-out	2025-03-17 06:55:07 -03:00
vc.el	Make marking conflicted files as resolved upon saving opt-out	2025-03-17 06:55:07 -03:00