Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-add.out @ 5253:fd371f99f20b
Automated merge with http://hg.intevation.org/mercurial/crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 27 Aug 2007 13:38:34 -0700 |
parents | 212de429e000 |
children |
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