tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jun 2007 20:21:10 +0200
changeset 4684 849f011dbf79
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Remember path to 'hg' executable and pass to external tools and hooks as $HG.

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