equal
deleted
inserted
replaced
|
1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2 created new head |
|
3 |
|
4 % Merging a conflict araises |
|
5 merging A |
|
6 warning: conflicts during merge. |
|
7 merging A failed! |
|
8 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
9 use 'hg resolve' to retry unresolved file merges |
|
10 |
|
11 % Correct the conflict without marking the file as resolved |
|
12 abort: unresolved merge conflicts (see hg resolve) |
|
13 |
|
14 % Mark the conflict as resolved and commit |