Mercurial > hg
changeset 6550:628da4a91628
Merge with crew-stable, fix test output
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 14 Apr 2008 23:28:50 +0200 |
| parents | 2af1b9de62b3 (current diff) 732c2259fc05 (diff) |
| children | 4a064e1977f8 |
| files | tests/test-merge-internal-tools-pattern.out |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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