changeset 26621 | 36383507a6f8 |
parent 26620 | 7955127efbcb |
child 26784 | c0aab5961876 |
--- a/tests/test-resolve.t Sun Oct 11 23:56:44 2015 -0700 +++ b/tests/test-resolve.t Sun Oct 11 23:58:07 2015 -0700 @@ -135,8 +135,8 @@ resolve --all should re-merge all unresolved files $ hg resolve --all merging file1 + merging file2 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') - merging file2 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') [1] $ cat file1.orig