tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Tue, 17 Jul 2007 23:33:42 +0200
changeset 5083 73169e5d2732
parent 3592 fffc8a733bf9
permissions -rw-r--r--
posixfile_nt: '+' was understood as read mode instead of update.

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