delta/emacs.git - git.savannah.gnu.org: git/emacs.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refine	Charles A. Roelli	2019-03-03	1	-2/+2
*	* lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New var	Stefan Monnier	2019-02-18	1	-9/+29
*	* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command	Konstantin Kharlamov	2019-02-18	1	-0/+14
*	Merge from origin/emacs-26	Paul Eggert	2018-12-31	1	-1/+1
\|\
\| *	Update copyright year to 2019	Paul Eggert	2019-01-01	1	-1/+1
* \|	Replace insignificant backquotes	Michael Heerdegen	2018-11-25	1	-3/+3
* \|	Speed up smerge-refine-regions by avoiding fsync	Noam Postavsky	2018-07-12	1	-3/+4
* \|	Optionally add argument description in minor mode DOC (bug#10754)	John Shahid	2018-07-01	1	-3/+1
* \|	Remove some more face aliases obsolete since 22.1	Glenn Morris	2018-01-10	1	-2/+0
\|/
*	Fix failures in smerge-mode on MS-Windows	Eli Zaretskii	2018-01-05	1	-2/+4
*	Update copyright year to 2018	Paul Eggert	2018-01-01	1	-1/+1
*	* lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.	Glenn Morris	2017-12-15	1	-3/+3
*	* lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.	Glenn Morris	2017-12-15	1	-2/+2
*	maint: shorten https://lists.gnu.org/archive/html/... links	Paul Eggert	2017-11-25	1	-1/+1
*	Prefer HTTPS to HTTP for gnu.org	Paul Eggert	2017-10-01	1	-1/+1
*	Allow smerge-keep-current to work for empty hunks	Tom Tromey	2017-09-16	1	-1/+1
*	Prefer HTTPS to FTP and HTTP in documentation	Paul Eggert	2017-09-13	1	-2/+2
*	* lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate cases	Stefan Monnier	2017-07-27	1	-17/+49
*	* lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufs	Stefan Monnier	2017-05-17	1	-44/+49
*	Merge from origin/emacs-25	Paul Eggert	2017-01-01	1	-1/+1
\|\
\| *	Update copyright year to 2017	Paul Eggert	2016-12-31	1	-1/+1
* \|	; Replace "25.2" with "26.1" where appropriate, which is almost everywhere	Glenn Morris	2016-11-17	1	-7/+7
* \|	Change Smerge "Mine" and "Other" for "Upper" and "Lower. (Bug#20878)	Glenn Morris	2016-01-30	1	-75/+104
\|/
*	Update copyright year to 2016	Paul Eggert	2016-01-01	1	-1/+1
*	Fix docstring quoting problems with ‘ '’	Paul Eggert	2015-11-17	1	-3/+3
*	Update copyright year to 2015	Paul Eggert	2015-01-01	1	-1/+1
*	* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.	Stefan Monnier	2014-12-01	1	-0/+13
*	* lisp/vc/diff-mode.el (diff-refine-changed): Rename from	Juri Linkov	2014-06-18	1	-1/+2
*	Update copyright year to 2014 by running admin/update-copyright.	Paul Eggert	2014-01-01	1	-1/+1
*	* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based	David Kastrup	2013-11-25	1	-6/+23
*	* lisp/vc/smerge-mode.el: Remove redundant :group args.	Stefan Monnier	2013-08-28	1	-16/+5
*	Update copyright notices for 2013.	Paul Eggert	2013-01-01	1	-1/+1
*	* lisp/facemenu.el (list-colors-sort): Add option "Luminance".	Juri Linkov	2012-09-30	1	-1/+1
*	Replace version 24.2 with 24.3 where appropriate (hopefully)	Glenn Morris	2012-08-15	1	-2/+2
*	Reduce use of (require 'cl).	Stefan Monnier	2012-07-10	1	-9/+9
*	Use the same diff color scheme as in modern VCSes (bug#10181).	Juri Linkov	2012-05-25	1	-26/+75
*	Add new error and function `user-error'.	Stefan Monnier	2012-05-04	1	-6/+3
*	Minor-mode doc fixes for ARG behavior	Glenn Morris	2012-02-07	1	-0/+3
*	Add 2012 to FSF copyright years for Emacs files	Glenn Morris	2012-01-05	1	-1/+1
*	Silence warning for unused `dotimes' counter variables.	Juanma Barranquero	2011-06-02	1	-3/+3
*	* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.	Stefan Monnier	2011-05-23	1	-0/+1
*	Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.	Glenn Morris	2011-05-12	1	-2/+2
*	Misc fixes, and use lexical-binding in more files.	Stefan Monnier	2011-03-11	1	-1/+1
*	Convert consecutive FSF copyright years to ranges.	Glenn Morris	2011-01-24	1	-2/+1
*	Nuke arch-tags.	Glenn Morris	2011-01-15	1	-1/+0
*	* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.	Stefan Monnier	2011-01-14	1	-2/+71
*	Merge from emacs-23	Stefan Monnier	2011-01-14	1	-1/+1
*	* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to	Stefan Monnier	2010-11-12	1	-0/+4
*	* lisp/finder.el (finder-known-keywords): Add keyword "vc"	Juri Linkov	2010-06-11	1	-1/+1
*	Move version control related files to the "vc" subdirectory.	Juri Linkov	2010-06-11	1	-0/+1231