Mercurial > hg

view tests/test-issue619.out @ 7170:aff204c9bdd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert documentation: --config argument with spaces needs quoting.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Oct 2008 15:24:33 +0200
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