tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 07 Aug 2007 10:24:33 +0200
changeset 5115 ea7b982b6c08
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Remove trailing spaces

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