| commit | 56d707f1c33348670a8eea934b86445a37eae163 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 31 Mar 2008 02:57:39 +0000 (31 02:57 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 31 Mar 2008 02:57:39 +0000 (31 02:57 +0000) | ||
| tree | b58395e187fc67459489424a4538963520f97b38 | treesnapshot (tar.gz zip) |
| parent | a3886890a23ae763b9565aea1de1cc2c41a22379 | commitdiff |
(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.
(smerge-resolve): Add various resolution heuristics.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |