tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 12 Dec 2006 18:16:23 -0600
changeset 3885 1e0b94cfba0e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Remove deprecated old-style branch support

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