Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 2356:2db831b33e8f
Final stage of the hgweb split up.
hgweb and hgwebdir now have their own modules.
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Wed, 31 May 2006 10:42:44 -0700 |
parents | b2ae81a7df29 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a