tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Dec 2006 19:30:18 +0100
changeset 3883 6081b4c68baf
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Corrected synopsis for many commands. Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)

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