changeset 866 | 6d6095823b82 |
parent 839 | 9c918287d10b |
parent 864 | 6225bd773c51 |
child 894 | 62ec665759f2 |
child 896 | 01215ad04283 |
--- a/tests/test-merge-revert2 Tue Aug 09 09:36:34 2005 -0800 +++ b/tests/test-merge-revert2 Fri Aug 12 23:54:09 2005 -0800 @@ -4,6 +4,7 @@ cd t hg init echo "added file1" > file1 +echo "another line of text" >> file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "0 0" -u user