tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 02 Aug 2007 14:51:49 +0200
changeset 5166 7706ff46ef45
parent 3592 fffc8a733bf9
permissions -rw-r--r--
The >| redirection does not exist in plain sh.

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