branch | stable |
changeset 19095 | 5cc71484ee9c |
parent 18634 | 4b5d37ca3c11 |
child 20637 | 73a3a2386654 |
--- a/tests/test-rename-merge2.t Tue Apr 30 13:53:49 2013 +0200 +++ b/tests/test-rename-merge2.t Mon Apr 29 15:58:15 2013 +0900 @@ -290,6 +290,7 @@ rev: versions differ -> m preserving rev for resolve of rev removing a + updating: a 1/3 files (33.33%) getting b updating: b 2/3 files (66.67%) updating: rev 3/3 files (100.00%)