Mercurial > hg
view tests/test-issue842.out @ 11452:eac141407b85 stable
merge: document how to 'undo' a merge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 27 Jun 2010 17:41:43 -0500 |
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