Mercurial > hg
view tests/test-merge5.out @ 5709:9dc26941020b
ui: allow default when prompting
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 27 Dec 2007 22:49:01 -0600 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes