diff -r 57b50abe2b24 -r 7731a2281cf0 tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t Sun Apr 13 19:01:00 2014 +0200 +++ b/tests/test-rename-merge2.t Sun Apr 13 19:01:00 2014 +0200 @@ -774,7 +774,7 @@ Systematic and terse testing of merge merges and ancestor calculation: -Excpected result: +Expected result: \ a m1 m2 dst 0 - f f f "versions differ"