Sean Whitton 9a86a093bc vc-git--checkin: Ignore 'git apply --3way' exiting 1 ... This is expected to happen in some cases. * lisp/vc/vc-git.el (vc-git--with-apply-temp): New OKSTATUS parameter. (vc-git--checkin): Use it to ignore 'git apply --3way' exiting 1.		2025-09-25 18:19:38 +01:00
..
add-log.el
compare-w.el
cvs-status.el
diff-mode.el	New commands to apply changes to other working trees	2025-09-16 14:30:02 +01:00
diff.el
ediff-diff.el
ediff-help.el
ediff-hook.el
ediff-init.el
ediff-merg.el
ediff-mult.el
ediff-ptch.el
ediff-util.el	Fix 'ediff-before-setup-hook'	2025-07-05 11:07:29 +03:00
ediff-vers.el
ediff-wind.el
ediff.el
emerge.el
log-edit.el	; log-edit.el: Insert missing required cl-lib.	2025-09-12 15:41:38 +01:00
log-view.el	Make C-x v w w work in Log View mode, to change working directory	2025-09-08 11:50:36 +01:00
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el
pcvs.el	lisp/vc: Try and avoid quoting lambdas	2025-07-19 14:42:28 -04:00
smerge-mode.el	lisp/vc/smerge-mode.el (smerge--refine-highlight-change): Fix misalignment	2025-06-26 12:55:27 -04:00
vc-annotate.el	vc-annotate-warp-revision: Fix going through renames	2025-08-05 04:07:40 +03:00
vc-bzr.el	Rename arg REMOTE-LOCATION -> UPSTREAM-LOCATION	2025-09-01 09:41:40 +01:00
vc-cvs.el	; * lisp/vc/vc-cvs.el (vc-cvs-file-to-string): Simplify slightly.	2025-07-21 11:04:34 +01:00
vc-dir.el	vc-dir-mark-unmark: When region active, don't do any y/n prompting	2025-09-05 15:22:31 +01:00
vc-dispatcher.el	vc-do-command: In batch mode, print the output of failed commands	2025-08-12 14:34:45 +01:00
vc-filewise.el
vc-git.el	vc-git--checkin: Ignore 'git apply --3way' exiting 1	2025-09-25 18:19:38 +01:00
vc-hg.el	VC: New cherry-pick-comment API function	2025-09-24 17:24:41 +01:00
vc-hooks.el	Revert "* Clean-up some compilation warnings in vc-hooks.el"	2025-09-22 10:28:40 +02:00
vc-rcs.el
vc-sccs.el
vc-src.el
vc-svn.el
vc.el	VC: New cherry-pick-comment API function	2025-09-24 17:24:41 +01:00