# HG changeset patch # User Patrick Mezard # Date 1208208530 -7200 # Node ID 628da4a91628517b3e45ee07a2db857793fff6d0 # Parent 2af1b9de62b34728b2ebe482ac2d36c1beab3b62# Parent 732c2259fc055383bf66faf2082b72bec01ddd8b Merge with crew-stable, fix test output diff -r 2af1b9de62b3 -r 628da4a91628 tests/test-merge-internal-tools-pattern diff -r 2af1b9de62b3 -r 628da4a91628 tests/test-merge-internal-tools-pattern.out --- a/tests/test-merge-internal-tools-pattern.out Mon Apr 14 23:04:34 2008 +0200 +++ b/tests/test-merge-internal-tools-pattern.out Mon Apr 14 23:28:50 2008 +0200 @@ -9,9 +9,7 @@ created new head # merge using internal:fail tool 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 +use 'hg resolve' to retry unresolved file merges line 1 line 2 third line