author | Brodie Rao <me+hg@dackz.net> |
Tue, 18 Aug 2009 14:47:41 -0400 | |
changeset 9398 | 3fb8c6dbeeec |
parent 7821 | 9fe7e6acf525 |
child 9468 | b2310903c462 |
permissions | -rw-r--r-- |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig