tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Sun, 10 Jun 2007 20:08:47 -0700
changeset 4534 cc9b79216a76
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Split convert extension into common and repository type modules

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