diff options
| author | Konstantin Kharlamov <Hi-Angel@yandex.ru> | 2021-03-09 04:47:49 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-03-09 04:47:49 +0200 |
| commit | 40d8f83e53ba64355035da78967c994d09a7802d (patch) | |
| tree | 626dda30bc842d15439c793f0d91a2cc717a413c /test/lisp/emacs-lisp/lisp-tests.el | |
| parent | 853810813283662a71358a11c128c0a1d224197e (diff) | |
| download | emacs-40d8f83e53ba64355035da78967c994d09a7802d.tar.gz emacs-40d8f83e53ba64355035da78967c994d09a7802d.tar.bz2 emacs-40d8f83e53ba64355035da78967c994d09a7802d.zip | |
smerge-vc-next-conflict: Move to conflict markers more reliably
* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): Search for a
conflict marker if call to (vc-find-conflicted-file) haven't resulted in
a jump to one. And remove `buffer` variable that becomes unused.
Diffstat (limited to 'test/lisp/emacs-lisp/lisp-tests.el')
0 files changed, 0 insertions, 0 deletions