tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Tue, 10 Jul 2007 10:06:24 -0700
changeset 4853 6dc0094c0827
parent 3592 fffc8a733bf9
permissions -rw-r--r--
archive: abort on empty repository. Fixes #624.

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