Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.out @ 4944:10afa3fab6b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make [defaults] in .hg/hgrc work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 17:36:45 +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