Mercurial > hg
view tests/test-issue842.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should issue warning adding a created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % should not issue warning 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch testing % should not issue warning