tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 07 Apr 2007 19:42:26 +0100
changeset 4333 4f721e96f1de
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add test for issue 529 - "mq aborts when merging patch deleting files".

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