Mercurial > hg
view tests/test-update-renames.out @ 11683:757f39fa1162
dispatch: write Abort hint to stderr too
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 26 Jul 2010 22:28:37 +0200 |
parents | 4f11978ae45d |
children |
line wrap: on
line source
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