tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 09 Mar 2007 19:57:26 +0100
changeset 4169 0182cb2e4aac
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add tests for .hg/branches.cache feature list.

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