diff install-sh @ 82007:c934794f2e69

(change-log-resolve-conflict): Don't lose data if the merge fails.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 20 Jul 2007 20:41:58 +0000
parents 23a1cea22d13
children
line wrap: on
line diff