* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based
on the conflict markers when available. (smerge--get-marker): New function. (smerge-end-re, smerge-base-re): Add subgroup.
Showing
Please register or sign in to comment