tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Mon, 18 Dec 2006 12:22:43 -0800
changeset 3930 01d98d68d697
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add revlog.LookupError exception, and use it instead of RevlogError. Remove repo.LookupError, which devolves to the revlog version.

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