tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 02 Feb 2008 14:55:14 +0100
changeset 5999 d1fe1a4eb2b7
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Mention 'hg update' to switch branches in help for branch and branches.

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