Mercurial > hg
view tests/test-commit-unresolved.out @ 10796:ce2ae8bf3ae3 stable
Add missing --mq option to hg log.
Since norepo is a string, not a list, the norepo check was matching
command names against any substring in norepo. This fix splits norepo
into a list of commands.
author | Michael Glassford <glassfordmjg@gmail.com> |
---|---|
date | Wed, 31 Mar 2010 10:59:00 -0400 |
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