Mercurial > hg
view tests/test-add.out @ 7903:490e40816cbd
tests: strip o/s-dependent error messages from some http tests
author | John Coomes <john.coomes@sun.com> |
---|---|
date | Fri, 27 Feb 2009 17:28:26 -0800 |
parents | 9fe7e6acf525 |
children | 32537b12e091 |
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 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 up --clean' to abandon 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