tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 01 Dec 2008 12:11:28 +0100
changeset 7448 7900d240c3d8
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
Fix non-empty $CDPATH causing failed tests. If CDPATH contains '.', every cd command prints the target path, which causes additional output in tests and makes them fail.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')