summaryrefslogtreecommitdiff
path: root/test/lisp/vc/smerge-mode-tests.el
Commit message (Expand)AuthorAge
* Update copyright year to 2021Paul Eggert2021-01-01
* Use lexical-binding in most vc testsStefan Kangas2020-04-28
* Update copyright year to 2020Paul Eggert2020-01-01
* Go back to "Maintainer: emacs-devel@gnu.org"Paul Eggert2019-05-25
* Fixes for "Maintainer:" and related linesPaul Eggert2019-05-19
* Update copyright year to 2019Paul Eggert2019-01-01
* Fix copyright years by handPaul Eggert2018-01-01
* ; Spelling and URL fixesPaul Eggert2017-09-23
* Allow smerge-keep-current to work for empty hunksTom Tromey2017-09-16