Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert2 @ 894:62ec665759f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 13 Aug 2005 15:23:06 -0800
parents 9c918287d10b 6d6095823b82
children 77b52b864249
line wrap: on
line diff
--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -4,6 +4,7 @@ mkdir t
 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