3 commits

Author	SHA1	Message	Date
Paul Eggert	63b04c11d5	Fix copyright years by hand ... These are dates that admin/update-copyright did not update, or updated incorrectly.	2018-01-01 01:02:09 -08:00
Paul Eggert	f2b2201594	; Spelling and URL fixes	2017-09-23 00:36:56 -07:00
Tom Tromey	9d101376b4	Allow smerge-keep-current to work for empty hunks ... 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.	2017-09-16 21:55:05 -06:00