Mercurial > emacs
view etc/refcards/cs-dired-ref.pdf @ 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 | a8d49808168a |
children | 1022bba335de |