Mercurial > hg

view tests/test-issue619.out @ 11417:6f1d1ed3e19a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve merge with ancestor message
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Jun 2010 14:21:56 -0500
parents 6e65b451b62e
children
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: merging with a working directory ancestor has no effect
done