diff mkinstalldirs @ 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 730155197b96
children
line wrap: on
line diff