Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619.out @ 5325:5971cfc0a56a
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 24 Sep 2007 12:34:26 -0500 |
parents | 8808ea7da86b |
children |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' done