Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.out @ 5289:ed6df6b1c29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 07 Sep 2007 17:38:52 +0200
parents 8808ea7da86b
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: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done