Mercurial > hg
diff tests/test-commit-unresolved.out @ 6888:7c36a4fb05a3
make commit fail when committing unresolved files
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Wed, 13 Aug 2008 20:18:40 -0500 |
| parents | |
| children | 9fe7e6acf525 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-commit-unresolved.out Wed Aug 13 20:18:40 2008 -0500 @@ -0,0 +1,14 @@ +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