| author | Matt Mackall <mpm@selenic.com> |
| Mon, 18 May 2009 17:36:24 -0500 | |
| changeset 8503 | 90f86a5330bb |
| 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