comparison tests/test-merge-revert2 @ 836:1fe3b14c7044

Merge with TAH
author mpm@selenic.com
date Thu, 04 Aug 2005 13:27:41 -0800
parents 8f5637f0a0c0 ad8ff3534fde
children 9c918287d10b
comparison
equal deleted inserted replaced
827:a61728b58dc0 836:1fe3b14c7044
1 #!/bin/sh 1 #!/bin/sh
2 # FIXME: This test may fail due to an uncritical bug in Mercurial.
3 2
4 mkdir t 3 mkdir t
5 cd t 4 cd t
6 hg init 5 hg init
7 echo "added file1" > file1 6 echo "added file1" > file1