diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-29 18:06:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-29 18:06:43 -0700 |
| commit | 10184b2718db480b4a9bfcb78b6f1c4783dbec85 (patch) | |
| tree | 46cd8e7e4ef9af787f1c49478b6f3cc2e4decc2e /t/t6044-merge-unrelated-index-changes.sh | |
| parent | Merge branch 'ak/t4204-shell-portability' (diff) | |
| parent | t6044: replace seq by test_seq (diff) | |
| download | tgif-10184b2718db480b4a9bfcb78b6f1c4783dbec85.tar.xz | |
Merge branch 'js/t6044-use-test-seq'
Test portability fix.
* js/t6044-use-test-seq:
t6044: replace seq by test_seq
Diffstat (limited to 't/t6044-merge-unrelated-index-changes.sh')
| -rwxr-xr-x | t/t6044-merge-unrelated-index-changes.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 && |