tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Sat, 04 Aug 2007 23:07:52 -0700
changeset 5071 35d47b06d4e3
parent 3592 fffc8a733bf9
permissions -rw-r--r--
patch: add git symlink support

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