tests/test-update-renames.out
author Yuya Nishihara <yuya@tcha.org>
Fri, 21 May 2010 20:55:18 +0900
changeset 11208 2313dc4d9817
parent 10874 4f11978ae45d
permissions -rw-r--r--
tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.

merging a and b to b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges