tests/test-merge-revert.out
author Eric Hopper <hopper@omnifarious.org>
Tue, 27 Sep 2005 14:58:48 -0700
changeset 1354 8cf364c65425
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Made the abort message for IOError nicer when the filename is known.

1:3aa14bbc23d9
0:8633637036c1
3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip