Mercurial > hg

view tests/test-issue619.out @ 9391:2705e6816d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use 'x in dict' instead of 'dict.has_key(x)' "in" is faster, and has_key will be removed in py3k
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 24 Aug 2009 21:00:34 +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