Dmitry Gutov bc8141594d vc-merge: Look for 'merge-file' instead of 'merge' ... * lisp/vc/vc.el (vc-merge): Look for 'merge-file' in second clause (bug#50258).		2022-08-25 01:16:10 +03:00
..
add-log.el
compare-w.el
cvs-status.el
diff-mode.el
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
ediff-vers.el
ediff-wind.el
ediff.el
emerge.el
log-edit.el
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el
pcvs.el
smerge-mode.el
vc-annotate.el
vc-bzr.el
vc-cvs.el
vc-dav.el
vc-dir.el
vc-dispatcher.el
vc-filewise.el
vc-git.el
vc-hg.el
vc-hooks.el
vc-rcs.el
vc-sccs.el
vc-src.el
vc-svn.el
vc.el	vc-merge: Look for 'merge-file' instead of 'merge'	2022-08-25 01:16:10 +03:00