Mercurial > emacs
comparison Makefile.in @ 93445:87b6e6f4a207
(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 31 Mar 2008 02:57:39 +0000 |
| parents | c598ce296aea |
| children | bc725ee2bc85 |
comparison
equal
deleted
inserted
replaced
| 93444:3a3281d7f1dd | 93445:87b6e6f4a207 |
|---|