changeset 23139 | e53f6b72a0e4 |
parent 22791 | a074421fa4e1 |
child 23951 | 42f3042cc17f |
--- a/tests/test-tag.t Sun Nov 02 13:08:46 2014 +0900 +++ b/tests/test-tag.t Thu Apr 17 22:47:38 2014 +0200 @@ -479,7 +479,7 @@ 4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3 79505d5360b07e3e79d1052e347e73c02b8afa5b t3 -check that the merge tried to minimize the diff witht he first merge parent +check that the merge tried to minimize the diff with the first merge parent $ hg diff --git -r 'p1()' .hgtags diff --git a/.hgtags b/.hgtags