view tests/test-merge4.out @ 1434:696851b1bba9

Fix use of diff(1) triggered by set -e. Search harder for a decent diff/patch to use.
author levon@movementarian.org
date Mon, 24 Oct 2005 14:55:53 -0700
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source