changeset 15501 | 2371f4aea665 |
parent 15361 | c1930992e111 |
child 15513 | 646759147717 |
--- a/tests/test-graft.t Sat Nov 12 02:08:01 2011 +0100 +++ b/tests/test-graft.t Wed Nov 16 18:04:19 2011 -0600 @@ -151,7 +151,7 @@ merging e my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622 warning: conflicts during merge. - merging e failed! + merging e incomplete! (edit conflicts, then use 'hg resolve --mark') searching for copies back to rev 1 unmatched files in local: c