Mercurial > hg
view tests/test-add.out @ 10323:0aa59f532ef9
record: function variable naming & signature cleanup.
No functionality change. All tests pass.
author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
---|---|
date | Fri, 05 Feb 2010 18:46:22 +0100 |
parents | b2310903c462 |
children |
line wrap: on
line source
adding a ? a adding a 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 created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon M a ? a.orig % should fail a already tracked! M a ? a.orig % issue683 ? a.orig R a ? a.orig M a ? a.orig c: No such file or directory d: No such file or directory M a A c ? a.orig