1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
emacs/lisp/vc
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 Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
compare-w.el
cvs-status.el
diff-mode.el Make point-at-eol and point-at-bol obsolete 2022-08-23 04:54:57 +02:00
diff.el
ediff-diff.el
ediff-help.el Minor cleanups in ediff-*.el 2022-08-07 19:21:09 +02:00
ediff-hook.el Minor cleanups in ediff-*.el 2022-08-07 19:21:09 +02:00
ediff-init.el Make XEmacs compat alias face-background-pixmap obsolete 2022-08-23 16:51:31 +02:00
ediff-merg.el
ediff-mult.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
ediff-ptch.el Minor cleanups in ediff-*.el 2022-08-07 19:21:09 +02:00
ediff-util.el Minor cleanups in ediff-*.el 2022-08-07 19:21:09 +02:00
ediff-vers.el
ediff-wind.el Minor cleanups in ediff-*.el 2022-08-07 19:21:09 +02:00
ediff.el Merge from origin/emacs-28 2022-08-17 06:30:25 +02:00
emerge.el * lisp/vc/emerge.el (emerge-show-file-name): Make obsolete. 2022-08-11 13:11:50 +02:00
log-edit.el
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el * lisp/vc/pcvs-util.el (cvs-partition): Simplify. 2022-08-09 22:15:00 +02:00
pcvs.el
smerge-mode.el
vc-annotate.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
vc-bzr.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
vc-cvs.el Prefer ‘time-equal-p’ to ‘equal’ on timestamps 2022-08-01 01:17:17 -07:00
vc-dav.el
vc-dir.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
vc-dispatcher.el string-equal-ignore-case: new function 2022-07-26 13:49:28 -04:00
vc-filewise.el
vc-git.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
vc-hg.el Make point-at-eol and point-at-bol obsolete 2022-08-23 04:54:57 +02:00
vc-hooks.el Prefer defvar-keymap in vc/*.el 2022-08-10 11:53:27 +02:00
vc-rcs.el
vc-sccs.el
vc-src.el
vc-svn.el Fix some recently introduced byte-compiler warnings 2022-08-17 12:52:56 +02:00
vc.el vc-merge: Look for 'merge-file' instead of 'merge' 2022-08-25 01:16:10 +03:00