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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove redundant library installation instructions	Stefan Kangas	2022-11-11	1	-3/+2
*	Make smerge-refine-ignore-whitespace into defcustom	Lars Ingebrigtsen	2022-01-26	1	-2/+5
*	Merge from origin/emacs-28	Eli Zaretskii	2022-01-01	1	-1/+1
\|\
\| *	; Add 2022 to copyright years.	Eli Zaretskii	2022-01-01	1	-1/+1
* \|	Revert VC-related prefix user options to previous values	Lars Ingebrigtsen	2021-11-18	1	-4/+3
* \|	Adjust `defvar-keymap' and `define-keymap' to the new syntax	Lars Ingebrigtsen	2021-11-16	1	-3/+4
* \|	Fix typo in previous smerge-mode-map change	Lars Ingebrigtsen	2021-10-20	1	-1/+1
* \|	Fix build issue with smerge-mode	Lars Ingebrigtsen	2021-10-18	1	-0/+1
* \|	Convert smerge-mode.el from easy-mmode-defmap to define-keymap	Lars Ingebrigtsen	2021-10-18	1	-22/+20
\|/
*	; More stylistic docfixes in vc/*.el found by checkdoc	Stefan Kangas	2021-09-18	1	-1/+1
*	* lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.	Juri Linkov	2021-08-04	1	-0/+3
*	smerge-vc-next-conflict: Move to conflict markers more reliably	Konstantin Kharlamov	2021-03-09	1	-24/+25
*	make smerge-vc-next-conflict wrap around	Konstantin Kharlamov	2021-02-16	1	-6/+6
*	Assume font-lock-mode variable is not void	Stefan Kangas	2021-02-05	1	-1/+1
*	Prefer defvar-local in vc/*.el	Stefan Kangas	2021-01-31	1	-2/+1
*	Update copyright year to 2021	Paul Eggert	2021-01-01	1	-1/+1
*	Shorten over-wide docstrings in variables	Stefan Kangas	2020-12-19	1	-1/+1
*	Prefer setq-local in vc/*.el	Stefan Kangas	2020-12-05	1	-8/+8
*	Fix misuses of `make-local-variable` on hooks	Stefan Monnier	2020-11-04	1	-18/+20
*	* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable	Stefan Monnier	2020-03-18	1	-7/+8
*	* lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456	Stefan Monnier	2020-01-21	1	-1/+4
*	Update copyright year to 2020	Paul Eggert	2020-01-01	1	-1/+1
*	Add ':extend' attribute to faces and themes	Eli Zaretskii	2019-11-30	1	-3/+3
*	Add ':extend t' face attribute to diff faces (bug#37774)	Juri Linkov	2019-10-19	1	-8/+8
*	Check labels in smerge-mode	Ivan Shmakov	2019-06-25	1	-3/+7
*	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