tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:47:58 +0200
changeset 5144 6e040f6c2c9c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Print less scary message if the system supports symlinks: "Skipping test-no-symlinks: system supports symbolic links" instead of "Skipping test-no-symlinks: unexpected feature: symbolic links"

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes