Mercurial > hg
view tests/test-issue619.out @ 5504:8bc73135c453
Merge with stable.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 02 Nov 2007 14:45:05 -0700 |
parents | 8808ea7da86b |
children | cdc458b12f0f |
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