Stefan Monnier ac09e8e121 * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456 ... This situation is not an internal error, but a perfectly normal occurrence, so a `cl-assert` is not right		2020-01-21 15:58:17 -05:00
..
add-log.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
compare-w.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
cvs-status.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
diff-mode.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
diff.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-diff.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-help.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-hook.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-init.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-merg.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-mult.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-ptch.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-util.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-vers.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff-wind.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
ediff.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
emerge.el	* lisp/vc/emerge.el: Use lexical-binding	2018-04-03 23:17:30 -04:00
log-edit.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
log-view.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
pcvs-defs.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
pcvs-info.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
pcvs-parse.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
pcvs-util.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
pcvs.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
smerge-mode.el	* lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456	2020-01-21 15:58:17 -05:00
vc-annotate.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-bzr.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-cvs.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-dav.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-dir.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-dispatcher.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-filewise.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-git.el	vc-dir: ensure we don't use a pager with git	2020-01-13 09:26:41 +01:00
vc-hg.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-hooks.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-mtn.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-rcs.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-sccs.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-src.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc-svn.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00
vc.el	Update copyright year to 2020	2020-01-01 00:59:52 +00:00