view .arch-inventory @ 78572:5b92bb6e6570

(smerge-resolve): New arg `safe'. (smerge-resolve-all, smerge-batch-resolve): New function. (smerge-refine): Make sure `diff' returns the expected result. (smerge-parsep-re): New const. (smerge-mode): Use it to adjust paragraph-separate.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 16 Aug 2007 20:04:36 +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