diff options
| author | Tom Tromey <tom@tromey.com> | 2017-09-09 17:20:43 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-09-16 21:55:05 -0600 |
| commit | 9d101376b42e51007e7f83b646e172c52251ae1e (patch) | |
| tree | ac684590a5f53ccb8a36b5de634503f36b072d19 /doc/misc/octave-mode.texi | |
| parent | 13aba24adde7e46382daa1e4f0aad194e5232b83 (diff) | |
| download | emacs-9d101376b42e51007e7f83b646e172c52251ae1e.tar.gz emacs-9d101376b42e51007e7f83b646e172c52251ae1e.tar.bz2 emacs-9d101376b42e51007e7f83b646e172c52251ae1e.zip | |
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.
Diffstat (limited to 'doc/misc/octave-mode.texi')
0 files changed, 0 insertions, 0 deletions