procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
emacs/lisp/vc
History
Tino Calancha abe731eef0 epatch: Save right backups in Git multipatches 
Multipatches on N Git files save wrong backups for
N-1 files; only the last one has a correct backup (Bug#26084).
* lisp/vc/diff-mode.el (diff-file-junk-re): Add 'Prereq: '
* lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Use 'diff-file-junk-re'.
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug25010):
Rename from ibuffer-test-bug25010.
(ediff-ptch-test-bug26084): New test.
2017-03-21 17:25:55 +09:00
..
add-log.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
compare-w.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
cvs-status.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
diff-mode.el epatch: Save right backups in Git multipatches 2017-03-21 17:25:55 +09:00
diff.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-diff.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
ediff-help.el Show ancestor buffer in 3way merges 2017-03-14 16:12:29 +09:00
ediff-hook.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-init.el Show ancestor buffer in 3way merges 2017-03-14 16:12:29 +09:00
ediff-merg.el ; Fix a typo in ediff-merg.el 2017-01-21 00:31:40 +09:00
ediff-mult.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
ediff-ptch.el epatch: Save right backups in Git multipatches 2017-03-21 17:25:55 +09:00
ediff-util.el Show ancestor buffer in 3way merges 2017-03-14 16:12:29 +09:00
ediff-vers.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
ediff-wind.el Merge from origin/emacs-25 2017-03-19 12:34:03 -07:00
ediff.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
emerge.el ; Replace "25.2" with "26.1" where appropriate, which is almost everywhere 2016-11-17 22:50:40 -08:00
log-edit.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
log-view.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
pcvs-defs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs-info.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
pcvs-parse.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs-util.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
pcvs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
smerge-mode.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-annotate.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-bzr.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
vc-cvs.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-dav.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-dir.el Add more branch support to vc-dir 2017-02-25 10:46:13 -07:00
vc-dispatcher.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-filewise.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-git.el vc-log-outgoing fixes for git; add binding to vc-dir 2017-02-19 21:01:28 -07:00
vc-hg.el Remove stale comments from vc-git and vc-hg 2017-02-19 20:59:35 -07:00
vc-hooks.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-mtn.el Replace change-log-date-face -> change-log-date 2017-03-08 13:32:21 -05:00
vc-rcs.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-sccs.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc-src.el Merge from origin/emacs-25 2017-01-01 01:10:47 -08:00
vc-svn.el Update copyright year to 2017 2016-12-31 19:42:26 -08:00
vc.el Add more branch support to vc-dir 2017-02-25 10:46:13 -07:00