Mercurial > hg > gitweb
diff tests/test-merge-revert2 @ 895:77b52b864249
Merge walk changes with Matt's tip.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat, 13 Aug 2005 15:26:32 -0800 |
| parents | 9c918287d10b 62ec665759f2 |
| children | 01215ad04283 |
line wrap: on
line diff
--- a/tests/test-merge-revert2 Fri Aug 12 16:12:09 2005 -0800 +++ b/tests/test-merge-revert2 Sat Aug 13 15:26:32 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