Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6887:304484c7e0ba | 6888:7c36a4fb05a3 |
|---|---|
| 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 |