tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Fri, 14 Sep 2007 22:47:15 +0200
changeset 5307 5b0b0834419c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: test cvs repository conversion

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