tests/test-merge5.out
author Christoph Spiel <cspiel@freenet.de>
Thu, 27 Sep 2007 23:58:54 -0500
changeset 5364 5737845fd974
parent 3592 fffc8a733bf9
permissions -rw-r--r--
bdiff: simple splitlines optimization

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