test-commit-unresolved.out
14 lines
| 481 B
| text/plain
|
TextLexer
/ tests / test-commit-unresolved.out
Stefano Tortarolo
|
r6888 | 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 | ||||
Augie Fackler
|
r7821 | use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | ||
|
Stefano Tortarolo
|
r6888 | |||
| % Correct the conflict without marking the file as resolved | ||||
| abort: unresolved merge conflicts (see hg resolve) | ||||
| % Mark the conflict as resolved and commit | ||||