diff etc/DISTRIB @ 91813:ca1e1298a3d8

(smerge-auto-combine-max-separation): New var. (smerge-auto-combine): New fun.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 13 Feb 2008 15:10:57 +0000
parents 1dd7437446ea
children cbf5528cf447
line wrap: on
line diff