tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 05 Jul 2007 16:14:01 -0700
changeset 4825 a265fe42abe7
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: svn code movement (no actual changes)

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