lisp/vc/smerge-mode.el · 5f5b128d48afce520ddb675849224977ea253294 · emacs / emacs · GitLab

Find file Blame History Permalink

* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based · 5f5b128d
David Kastrup authored Nov 25, 2013
```
on the conflict markers when available.
(smerge--get-marker): New function.
(smerge-end-re, smerge-base-re): Add subgroup.
```
5f5b128d

smerge-mode.el 52.3 KB