changeset 12328 | b63f6422d2a7 |
parent 12254 | 852f10a15a6d |
child 12847 | b00eda50ad2b |
--- a/tests/test-merge-commit.t Fri Sep 17 17:03:04 2010 -0500 +++ b/tests/test-merge-commit.t Fri Sep 17 17:03:08 2010 -0500 @@ -1,4 +1,4 @@ -# Check that renames are correctly saved by a commit after a merge +Check that renames are correctly saved by a commit after a merge Test with the merge on 3 having the rename on the local parent