author | Matt Mackall <mpm@selenic.com> |
Fri, 03 Apr 2009 12:37:06 -0500 | |
changeset 7942 | 553cef16031f |
parent 7821 | 9fe7e6acf525 |
child 9468 | b2310903c462 |
permissions | -rw-r--r-- |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Merging a conflict araises merging A warning: conflicts during merge. merging A failed! 1 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 % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit