Mercurial > hg

view tests/test-issue619.out @ 10151:c7355a0e1f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: make git diffline generation more explicit
author Patrick Mezard <pmezard@gmail.com>
date Tue, 29 Dec 2009 16:00:38 +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