Mercurial > hg
comparison tests/test-rename-merge2 @ 3282:438b0638dbf5
Fix undetected change bug in rename tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 07 Oct 2006 17:30:26 -0500 |
parents | ae85272b59a4 |
children | 9dcf9d45cab8 |
comparison
equal
deleted
inserted
replaced
3281:f49c90b46897 | 3282:438b0638dbf5 |
---|---|
3 mkdir -p t | 3 mkdir -p t |
4 cd t | 4 cd t |
5 | 5 |
6 cat <<'EOF' > merge | 6 cat <<'EOF' > merge |
7 #!/bin/sh | 7 #!/bin/sh |
8 echo merge > $1 | 8 echo merge $1 $2 $3 > $1 |
9 EOF | 9 EOF |
10 chmod +x merge | 10 chmod +x merge |
11 | 11 |
12 # perform a test merge with possible renaming | 12 # perform a test merge with possible renaming |
13 # | 13 # |