]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13aba24) | patch
Allow smerge-keep-current to work for empty hunks
authorTom Tromey <tom@tromey.com>
Sat, 9 Sep 2017 23:20:43 +0000 (17:20 -0600)
committerTom Tromey <tom@tromey.com>
Sun, 17 Sep 2017 03:55:05 +0000 (21:55 -0600)
commit9d101376b42e51007e7f83b646e172c52251ae1e
treeac684590a5f53ccb8a36b5de634503f36b072d19tree | snapshot
parent13aba24adde7e46382daa1e4f0aad194e5232b83commit | diff
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.
lisp/vc/smerge-mode.el diff | blob | history
test/lisp/vc/smerge-mode-tests.el [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.