Mercurial > hg
view tests/test-update-renames.out @ 11701:84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
os.rename() does not overwrite existing targets on Windows.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 28 Jul 2010 11:07:20 +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