view .arch-inventory @ 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 7cb1d5f71446
children
line wrap: on
line source

# Generated files
precious ^(config\.status|config\.cache)$

# Install-in-place makes these directories, so just ignore them
backup ^(bin|data|lock|site-lisp)$

# arch-tag: 6eeeaa4e-cc7e-4b22-b3d7-1089e155da14