log hgmerge @ 1612:0d36e3d7e2ea

age author description
Mon, 24 Oct 2005 14:55:53 -0700 levon Fix use of diff(1) triggered by set -e.