Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9.out @ 4741:87a35bb58b88
mercurial.spec: fix when default python prefix != rpm %{_prefix}
e.g. on SUSE Linux Enterprise 10
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sat, 02 Jun 2007 12:42:47 +0100 |
parents | dc5920ea12f8 |
children | f191bc3916f7 |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 merging bar merging bar failed! merging foo and baz merging foo failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo merging baz failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2