Mercurial > hg
view tests/test-commit-unresolved.out @ 9510:8bd669948b2e
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 01 Oct 2009 11:40:53 +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