Mercurial > hg
view tests/test-commit-unresolved.out @ 11774:91c4e6d2c9e5
bookmarks: replace var used as a Boolean with a Boolean
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Tue, 10 Aug 2010 16:55:38 +0200 |
parents | b2310903c462 |
children |
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 or 'hg update -C' to abandon % Correct the conflict without marking the file as resolved abort: unresolved merge conflicts (see hg resolve) % Mark the conflict as resolved and commit