tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 10 Jan 2007 20:35:27 +0100
changeset 4023 6ea8a3b805ee
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Flush stderr after write. stderr can be buffered under win32 when redirected to a file, including stdout.

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