Mercurial > hg
view tests/test-commit-unresolved.out @ 7049:6489ee64b522
fetch: use dirstate branch instead of first parents
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 24 Sep 2008 13:22:11 +0200 |
parents | 7c36a4fb05a3 |
children | 9fe7e6acf525 |
line wrap: on
line source
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