tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 18 Oct 2006 12:17:02 +0200
changeset 3454 0600d326d96a
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Adjust default cmdline style to really match verbose/debug log.

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