diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 17:59:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:13:59 -0700 |
| commit | 3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e (patch) | |
| tree | b7fc41aa5f6e13fd411ecb212921a72b1d0d1684 /t/t6026-merge-attr.sh | |
| parent | 0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (diff) | |
| download | git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.gz | |
tests: use "git xyzzy" form (t3600 - t6999)
Converts tests between t3600-t6300.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6026-merge-attr.sh')
| -rwxr-xr-x | t/t6026-merge-attr.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 56fc341768..4b423e937d 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -106,9 +106,9 @@ test_expect_success 'custom merge backend' ' cmp binary union && sed -e 1,3d text >check-1 && - o=$(git-unpack-file master^:text) && - a=$(git-unpack-file side^:text) && - b=$(git-unpack-file master:text) && + o=$(git unpack-file master^:text) && + a=$(git unpack-file side^:text) && + b=$(git unpack-file master:text) && sh -c "./custom-merge $o $a $b 0" && sed -e 1,3d $a >check-2 && cmp check-1 check-2 && @@ -133,9 +133,9 @@ test_expect_success 'custom merge backend' ' cmp binary union && sed -e 1,3d text >check-1 && - o=$(git-unpack-file master^:text) && - a=$(git-unpack-file anchor:text) && - b=$(git-unpack-file master:text) && + o=$(git unpack-file master^:text) && + a=$(git unpack-file anchor:text) && + b=$(git unpack-file master:text) && sh -c "./custom-merge $o $a $b 0" && sed -e 1,3d $a >check-2 && cmp check-1 check-2 && |