From: Junio C Hamano Date: Mon, 30 May 2016 01:06:43 +0000 (-0700) Subject: Merge branch 'js/t6044-use-test-seq' X-Git-Tag: v2.9.0-rc1~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10184b2718db480b4a9bfcb78b6f1c4783dbec85?hp=b586d8c733cee142b5b986886e610b09f6f03897 Merge branch 'js/t6044-use-test-seq' Test portability fix. * js/t6044-use-test-seq: t6044: replace seq by test_seq --- diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh index 20a3ffed69..01023486c5 100755 --- a/t/t6044-merge-unrelated-index-changes.sh +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -20,7 +20,7 @@ test_description="merges with unrelated index changes" # Commit E: renames a->subdir/a, adds subdir/e test_expect_success 'setup trivial merges' ' - seq 1 10 >a && + test_seq 1 10 >a && git add a && test_tick && git commit -m A && @@ -42,7 +42,7 @@ test_expect_success 'setup trivial merges' ' test_tick && git commit -m C && git checkout D && - seq 2 10 >a && + test_seq 2 10 >a && echo d >d && git add a d && test_tick && git commit -m D &&