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

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)