Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 4746:6def53be19fb
buildrpm: fix rpm release number calculation
It was broken when patch queues were in use.
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sat, 30 Jun 2007 01:21:41 +0100 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 <<<<<<< my something else ======= something >>>>>>> other M a