Mercurial > hg

view tests/test-issue619.out @ 7387:7e9a15fa6c8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update help on git diffs
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Nov 2008 15:35:34 -0600
parents cdc458b12f0f
children 5b48d819d5f9
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: can't merge with ancestor
done