summaryrefslogtreecommitdiff
path: root/test/lisp/vc/smerge-mode-tests.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* ; Minor stylistic checkdoc fixes in test/**/*.elStefan Kangas2021-09-261-0/+2
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Use lexical-binding in most vc testsStefan Kangas2020-04-281-0/+2
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Go back to "Maintainer: emacs-devel@gnu.org"Paul Eggert2019-05-251-0/+2
* Fixes for "Maintainer:" and related linesPaul Eggert2019-05-191-2/+0
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* Fix copyright years by handPaul Eggert2018-01-011-1/+1
* ; Spelling and URL fixesPaul Eggert2017-09-231-1/+1
* Allow smerge-keep-current to work for empty hunksTom Tromey2017-09-161-0/+34