summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* smerge-vc-next-conflict: Move to conflict markers more reliablyKonstantin Kharlamov2021-03-091-24/+25
* make smerge-vc-next-conflict wrap aroundKonstantin Kharlamov2021-02-161-6/+6
* Assume font-lock-mode variable is not voidStefan Kangas2021-02-051-1/+1
* Prefer defvar-local in vc/*.elStefan Kangas2021-01-311-2/+1
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Shorten over-wide docstrings in variablesStefan Kangas2020-12-191-1/+1
* Prefer setq-local in vc/*.elStefan Kangas2020-12-051-8/+8
* Fix misuses of `make-local-variable` on hooksStefan Monnier2020-11-041-18/+20
* * lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enableStefan Monnier2020-03-181-7/+8
* * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456Stefan Monnier2020-01-211-1/+4
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Add ':extend' attribute to faces and themesEli Zaretskii2019-11-301-3/+3
* Add ':extend t' face attribute to diff faces (bug#37774)Juri Linkov2019-10-191-8/+8
* Check labels in smerge-modeIvan Shmakov2019-06-251-3/+7
* Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli2019-03-031-2/+2
* * lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New varStefan Monnier2019-02-181-9/+29
* * lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New commandKonstantin Kharlamov2019-02-181-0/+14
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* | Replace insignificant backquotesMichael Heerdegen2018-11-251-3/+3
* | Speed up smerge-refine-regions by avoiding fsyncNoam Postavsky2018-07-121-3/+4
* | Optionally add argument description in minor mode DOC (bug#10754)John Shahid2018-07-011-3/+1
* | Remove some more face aliases obsolete since 22.1Glenn Morris2018-01-101-2/+0
|/
* Fix failures in smerge-mode on MS-WindowsEli Zaretskii2018-01-051-2/+4
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode.Glenn Morris2017-12-151-3/+3
* * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias.Glenn Morris2017-12-151-2/+2
* maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert2017-11-251-1/+1
* Prefer HTTPS to HTTP for gnu.orgPaul Eggert2017-10-011-1/+1
* Allow smerge-keep-current to work for empty hunksTom Tromey2017-09-161-1/+1
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-2/+2
* * lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate casesStefan Monnier2017-07-271-17/+49
* * lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufsStefan Monnier2017-05-171-44/+49
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | ; Replace "25.2" with "26.1" where appropriate, which is almost everywhereGlenn Morris2016-11-171-7/+7
* | Change Smerge "Mine" and "Other" for "Upper" and "Lower. (Bug#20878)Glenn Morris2016-01-301-75/+104
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Fix docstring quoting problems with ‘ '’Paul Eggert2015-11-171-3/+3
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* * lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.Stefan Monnier2014-12-011-0/+13
* * lisp/vc/diff-mode.el (diff-refine-changed): Rename fromJuri Linkov2014-06-181-1/+2
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names basedDavid Kastrup2013-11-251-6/+23
* * lisp/vc/smerge-mode.el: Remove redundant :group args.Stefan Monnier2013-08-281-16/+5
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* * lisp/facemenu.el (list-colors-sort): Add option "Luminance".Juri Linkov2012-09-301-1/+1
* Replace version 24.2 with 24.3 where appropriate (hopefully)Glenn Morris2012-08-151-2/+2
* Reduce use of (require 'cl).Stefan Monnier2012-07-101-9/+9
* Use the same diff color scheme as in modern VCSes (bug#10181).Juri Linkov2012-05-251-26/+75
View Lorry Controller Status