tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 05 Dec 2006 22:46:36 +0100
changeset 3802 a0d0d24c4e71
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Removed unused parameters/options of update command.

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