Mercurial > hg > gitweb
diff tests/test-merge6 @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 7e4843b7efd2 ec85f9e6f3b1 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-merge6 Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-merge6 Sat Jul 30 08:35:29 2005 -0800 @@ -1,11 +1,11 @@ -#!/bin/sh -x +#!/bin/sh cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge -export HGMERGE=./merge +HGMERGE=./merge; export HGMERGE mkdir A1 cd A1