tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Mon, 14 Aug 2006 22:48:03 -0700
changeset 2892 8b02af865990
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Add diff --git option

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