tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Mon, 25 Jun 2007 09:49:40 -0700
changeset 4711 c71bf1d251ad
parent 3592 fffc8a733bf9
permissions -rw-r--r--
mq: document that qinit -c may be run later

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