summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* Remove redundant library installation instructionsStefan Kangas2022-11-111-3/+2
* Make smerge-refine-ignore-whitespace into defcustomLars Ingebrigtsen2022-01-261-2/+5
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | Revert VC-related prefix user options to previous valuesLars Ingebrigtsen2021-11-181-4/+3
* | Adjust `defvar-keymap' and `define-keymap' to the new syntaxLars Ingebrigtsen2021-11-161-3/+4
* | Fix typo in previous smerge-mode-map changeLars Ingebrigtsen2021-10-201-1/+1
* | Fix build issue with smerge-modeLars Ingebrigtsen2021-10-181-0/+1
* | Convert smerge-mode.el from easy-mmode-defmap to define-keymapLars Ingebrigtsen2021-10-181-22/+20
|/
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-1/+1
* * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.Juri Linkov2021-08-041-0/+3
* 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
|/
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-11 05:01:57 +0000