tests/test-merge5.out
author Eric Hopper <hopper@omnifarious.org>
Thu, 21 Jun 2007 10:40:09 -0700
changeset 4675 6858a7477a5e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Change branches to sort 'active' branches first, and add an option to show only active branches.

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