tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Tue, 17 Jul 2007 23:34:52 +0200
changeset 4922 020ee9c781cf
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
patch: fix normalized paths separators.

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