comparison tests/test-merge3 @ 808:8f5637f0a0c0

Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 7e4843b7efd2 ec85f9e6f3b1
children 0902ffece4b4
comparison
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
1 #!/bin/sh -x 1 #!/bin/sh
2 2
3 hg init 3 hg init
4 echo This is file a1 > a 4 echo This is file a1 > a
5 hg add a 5 hg add a
6 hg commit -m "commit #0" -d "0 0" 6 hg commit -m "commit #0" -d "0 0"