Mercurial > hg
view tests/test-commit-unresolved.out @ 11571:636554d58665 stable
subrepo: docstrings
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 15 Jul 2010 13:24:02 +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