index
:
emacs
athena/bookworm-backports
athena/bullseye-backports
athena/unstable
series/unexpanded-input-v2
[no description]
git repository hosting
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lisp
/
vc
/
smerge-mode.el
Commit message (
Expand
)
Author
Age
*
Assume font-lock-mode variable is not void
Stefan Kangas
2021-02-05
*
Prefer defvar-local in vc/*.el
Stefan Kangas
2021-01-31
*
Update copyright year to 2021
Paul Eggert
2021-01-01
*
Shorten over-wide docstrings in variables
Stefan Kangas
2020-12-19
*
Prefer setq-local in vc/*.el
Stefan Kangas
2020-12-05
*
Fix misuses of `make-local-variable` on hooks
Stefan Monnier
2020-11-04
*
* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable
Stefan Monnier
2020-03-18
*
* lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456
Stefan Monnier
2020-01-21
*
Update copyright year to 2020
Paul Eggert
2020-01-01
*
Add ':extend' attribute to faces and themes
Eli Zaretskii
2019-11-30
*
Add ':extend t' face attribute to diff faces (bug#37774)
Juri Linkov
2019-10-19
*
Check labels in smerge-mode
Ivan Shmakov
2019-06-25
*
Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refine
Charles A. Roelli
2019-03-03
*
* lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New var
Stefan Monnier
2019-02-18
*
* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command
Konstantin Kharlamov
2019-02-18
*
Merge from origin/emacs-26
Paul Eggert
2018-12-31
|
\
|
*
Update copyright year to 2019
Paul Eggert
2019-01-01
*
|
Replace insignificant backquotes
Michael Heerdegen
2018-11-25
*
|
Speed up smerge-refine-regions by avoiding fsync
Noam Postavsky
2018-07-12
*
|
Optionally add argument description in minor mode DOC (bug#10754)
John Shahid
2018-07-01
*
|
Remove some more face aliases obsolete since 22.1
Glenn Morris
2018-01-10
|
/
*
Fix failures in smerge-mode on MS-Windows
Eli Zaretskii
2018-01-05
*
Update copyright year to 2018
Paul Eggert
2018-01-01
*
* lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.
Glenn Morris
2017-12-15
*
* lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.
Glenn Morris
2017-12-15
*
maint: shorten https://lists.gnu.org/archive/html/... links
Paul Eggert
2017-11-25
*
Prefer HTTPS to HTTP for gnu.org
Paul Eggert
2017-10-01
*
Allow smerge-keep-current to work for empty hunks
Tom Tromey
2017-09-16
*
Prefer HTTPS to FTP and HTTP in documentation
Paul Eggert
2017-09-13
*
* lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate cases
Stefan Monnier
2017-07-27
*
* lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufs
Stefan Monnier
2017-05-17
*
Merge from origin/emacs-25
Paul Eggert
2017-01-01
|
\
|
*
Update copyright year to 2017
Paul Eggert
2016-12-31
*
|
; Replace "25.2" with "26.1" where appropriate, which is almost everywhere
Glenn Morris
2016-11-17
*
|
Change Smerge "Mine" and "Other" for "Upper" and "Lower. (Bug#20878)
Glenn Morris
2016-01-30
|
/
*
Update copyright year to 2016
Paul Eggert
2016-01-01
*
Fix docstring quoting problems with ‘ '’
Paul Eggert
2015-11-17
*
Update copyright year to 2015
Paul Eggert
2015-01-01
*
* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.
Stefan Monnier
2014-12-01
*
* lisp/vc/diff-mode.el (diff-refine-changed): Rename from
Juri Linkov
2014-06-18
*
Update copyright year to 2014 by running admin/update-copyright.
Paul Eggert
2014-01-01
*
* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based
David Kastrup
2013-11-25
*
* lisp/vc/smerge-mode.el: Remove redundant :group args.
Stefan Monnier
2013-08-28
*
Update copyright notices for 2013.
Paul Eggert
2013-01-01
*
* lisp/facemenu.el (list-colors-sort): Add option "Luminance".
Juri Linkov
2012-09-30
*
Replace version 24.2 with 24.3 where appropriate (hopefully)
Glenn Morris
2012-08-15
*
Reduce use of (require 'cl).
Stefan Monnier
2012-07-10
*
Use the same diff color scheme as in modern VCSes (bug#10181).
Juri Linkov
2012-05-25
*
Add new error and function `user-error'.
Stefan Monnier
2012-05-04
*
Minor-mode doc fixes for ARG behavior
Glenn Morris
2012-02-07
[next]