Mercurial > hg
view tests/test-add.out @ 6024:3121f0feefb4
keyword: nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 04 Feb 2008 21:08:45 +0100 |
parents | 5af5f0f9d724 |
children | 4b0c9c674707 |
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 merging a warning: conflicts during merge. 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 ? a.orig % should fail a already tracked! M a ? a.orig % issue683 R a ? a.orig M a ? a.orig c does not exist! d does not exist! M a A c ? a.orig