tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Fri, 11 Aug 2006 15:50:16 -0700
changeset 2860 0f08f2c042ec
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Move patch-related code into its own module.

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