tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Sat, 21 Jul 2007 19:07:18 -0700
changeset 4966 8d982aef0be1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
addremove: print meaningful error message if --similar not numeric

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