diff options
| author | David Kastrup <dak@gnu.org> | 2013-11-25 10:40:31 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-11-25 10:40:31 -0500 |
| commit | 5f5b128d48afce520ddb675849224977ea253294 (patch) | |
| tree | 63159e98cc0a3721cac6e2104a93d195004c9b73 /lisp/files.el | |
| parent | 623891e5c6643587e7a61dea25aacdc470a4d866 (diff) | |
| download | emacs-5f5b128d48afce520ddb675849224977ea253294.tar.gz | |
* 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.
Diffstat (limited to 'lisp/files.el')
0 files changed, 0 insertions, 0 deletions