Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4724:a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Jun 2007 21:18:19 -0500 |
parents | fffc8a733bf9 |
children |
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