Mercurial > hg

view tests/test-issue619.out @ 8281:3e1e499db9d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: initialize md5 and sha1 without using extra global variables This lets the functions skip the "if _sha1 is None" test on each call.
author Martin Geisler <mg@lazybytes.net>
date Sun, 03 May 2009 00:03:35 +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