Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 2347:5b178298b7f4
use a more reliable way to find what are the new changesets on pull/unbundle
The number of csets and the hooks where wrong (negative number of csets) when
we unbundled a bundle which contains csets we already had.
Remove unused variables.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 24 May 2006 10:59:30 +0200 |
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