Mercurial > hg
view tests/test-add.out @ 5780:0ae953487255
Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 01 Jan 2008 17:12:37 +0100 |
parents | 883d887c6408 |
children | 5af5f0f9d724 |
line wrap: on
line source
adding a ? a adding a A a A a ? b A a A b % should fail b already tracked! A a A b % should fail a already tracked! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved warning: conflicts during merge. merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 M a % should fail a already tracked! M a % issue683 R a M a c does not exist! d does not exist! M a A c