tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 30 Aug 2006 13:42:57 -0700
changeset 3056 6848528f7ebd
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Remove temporary git patch files

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