author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
Mon, 20 Oct 2008 14:58:49 +0200 | |
changeset 7189 | 8bbbba2a1a9c |
parent 6888 | 7c36a4fb05a3 |
child 7821 | 9fe7e6acf525 |
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 % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit