author | Greg Ward <greg-hg@gerg.ca> |
Mon, 20 Apr 2009 21:10:39 -0400 | |
changeset 8093 | 70d8f70264c4 |
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