Mercurial > hg

view tests/test-issue619.out @ 10078:97c75ad3b1a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: Make get_mtime use repository to find store path. It was calculating it directly, which is redundant and caused it to break with shared repositories.
author Brendan Cully <brendan@kublai.com>
date Tue, 15 Dec 2009 12:33:04 -0800
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