]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 623891e) | patch
* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based
authorDavid Kastrup <dak@gnu.org>
Mon, 25 Nov 2013 15:40:31 +0000 (10:40 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 25 Nov 2013 15:40:31 +0000 (10:40 -0500)
commit5f5b128d48afce520ddb675849224977ea253294
tree63159e98cc0a3721cac6e2104a93d195004c9b73tree | snapshot
parent623891e5c6643587e7a61dea25aacdc470a4d866commit | diff
* 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.
lisp/ChangeLog diff | blob | history
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.