diff options
| author | Stefan Monnier | 2008-03-31 02:57:39 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-03-31 02:57:39 +0000 |
| commit | 56d707f1c33348670a8eea934b86445a37eae163 (patch) | |
| tree | b58395e187fc67459489424a4538963520f97b38 /src/gmalloc.c | |
| parent | a3886890a23ae763b9565aea1de1cc2c41a22379 (diff) | |
| download | emacs-56d707f1c33348670a8eea934b86445a37eae163.tar.gz emacs-56d707f1c33348670a8eea934b86445a37eae163.zip | |
(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.
Diffstat (limited to 'src/gmalloc.c')
0 files changed, 0 insertions, 0 deletions