Mercurial > hg

view tests/test-issue619.out @ 8904:8be38b624902

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: no longer mention the deprecated qdelete's --revision option The option will no longer show up in the list, unless --verbose is used. 'qdel -r' has been deprecated in favor of qfinish since the 1.1 release. It is still fully functional, but new users need not learn about it.
author Cédric Duval <cedricduval@free.fr>
date Tue, 23 Jun 2009 22:20:25 +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