author | Patrick Mezard <pmezard@gmail.com> |
Wed, 20 Jan 2010 09:49:15 +0100 | |
changeset 10266 | e2c24bb25b36 |
parent 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 update -C' 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