Mercurial > hg
view tests/test-commit-unresolved.out @ 7437:3cdaac732b2b
tests: fix test results for 07faba78cf5a
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 27 Nov 2008 18:46:45 +0100 |
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