summaryrefslogtreecommitdiff
path: root/test/lisp/vc/smerge-mode-tests.el
Commit message (Collapse)AuthorAgeFilesLines
* Use lexical-binding in most vc testsStefan Kangas2020-04-281-0/+2
| | | | | | | | | | | | * test/lisp/vc/add-log-tests.el: * test/lisp/vc/diff-mode-tests.el: * test/lisp/vc/ediff-ptch-tests.el: * test/lisp/vc/smerge-mode-tests.el: * test/lisp/vc/vc-hg-tests.el: * test/lisp/vc/vc-tests.el: Use lexical-binding. * test/lisp/vc/add-log-tests.el (add-log-current-defun-deftest): Silence byte-compiler.
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Go back to "Maintainer: emacs-devel@gnu.org"Paul Eggert2019-05-251-0/+2
| | | | | | Restore lines saying "Maintainer: emacs-devel@gnu.org" when there is no special maintainer for a file. Although this wasn't documented it was common practice and removing the lines didn't have consensus.
* Fixes for "Maintainer:" and related linesPaul Eggert2019-05-191-2/+0
| | | | | | Mostly, this just removes "Maintainer: emacs-devel@gnu.org" lines, which are not that useful. It also cleans up and regularizes a few similar lines.
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* Fix copyright years by handPaul Eggert2018-01-011-1/+1
| | | | | These are dates that admin/update-copyright did not update, or updated incorrectly.
* ; Spelling and URL fixesPaul Eggert2017-09-231-1/+1
|
* Allow smerge-keep-current to work for empty hunksTom Tromey2017-09-161-0/+34
Bug#25555 * lisp/vc/smerge-mode.el (smerge-get-current): Allow point to be at match-end. * test/lisp/vc/smerge-mode-tests.el: New file.