view tests/test-commit-unresolved.out @ 11208:2313dc4d9817

tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 21 May 2010 20:55:18 +0900
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