Mercurial > hg

view tests/test-issue619.out @ 10236:49a8625b8cac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shrink-revlog: help/doc tweaks - make it look right in 'hg help extensions' - clarify --revlog option - add a main program to tell users this is no longer a standalone script
author Greg Ward <greg-hg@gerg.ca>
date Tue, 12 Jan 2010 15:12:53 +0100
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