changeset 15501 | 2371f4aea665 |
parent 15447 | 9910f60a37ee |
child 15556 | e5804c0f6576 |
--- a/tests/test-keyword.t Sat Nov 12 02:08:01 2011 +0100 +++ b/tests/test-keyword.t Wed Nov 16 18:04:19 2011 -0600 @@ -976,7 +976,7 @@ $ hg merge merging m warning: conflicts during merge. - merging m failed! + merging m incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]