tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 11 Jul 2007 00:53:44 -0700
changeset 4856 1f3742217a76
parent 3592 fffc8a733bf9
permissions -rw-r--r--
replace .hgtags instead of appending to it when doing a raw commit

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