]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a388689) | patch
(smerge-apply-resolution-patch): New fun.
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 31 Mar 2008 02:57:39 +0000 (02:57 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 31 Mar 2008 02:57:39 +0000 (02:57 +0000)
commit56d707f1c33348670a8eea934b86445a37eae163
treeb58395e187fc67459489424a4538963520f97b38tree | snapshot
parenta3886890a23ae763b9565aea1de1cc2c41a22379commit | diff
(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.
lisp/ChangeLog diff | blob | history
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.