tests/test-merge5.out
author Christian Ebert <blacktrash@gmx.net>
Fri, 04 Jan 2008 18:22:39 +0100
changeset 5816 3bd22fd3b750
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
keyword: add test

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