summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add new error and function `user-error'.Stefan Monnier2012-05-041-6/+3
* Minor-mode doc fixes for ARG behaviorGlenn Morris2012-02-071-0/+3
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Silence warning for unused `dotimes' counter variables.Juanma Barranquero2011-06-021-3/+3
* * lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.Stefan Monnier2011-05-231-0/+1
* Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.Glenn Morris2011-05-121-2/+2
* Misc fixes, and use lexical-binding in more files.Stefan Monnier2011-03-111-1/+1
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
* * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.Stefan Monnier2011-01-141-2/+71
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
* * lisp/vc/smerge-mode.el (smerge-refine): Choose better default part toStefan Monnier2010-11-121-0/+4
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-111-1/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1231
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-11 06:39:34 +0000