tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Sun, 13 May 2007 19:15:54 -0700
changeset 4437 a210b40d0860
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Make mergepatch save queue now that qpush isn't.

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