Mercurial > hg

view tests/test-issue619.out @ 11202:f974fe896921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: hide unbundle messages by default Unbundling is an internal implementation detail for strip, only show them with --verbose.
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 13:27:28 -0500
parents 6e65b451b62e
children 6f1d1ed3e19a
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