author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
Tue, 30 Dec 2008 22:10:41 +0100 | |
changeset 7554 | 11a4eb81fb4f |
parent 6518 | 92ccccb55ba3 |
child 7821 | 9fe7e6acf525 |
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 e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig