development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'js/t6044-use-test-seq'

Browse source 
Test portability fix.

* js/t6044-use-test-seq:
  t6044: replace seq by test_seq
This commit is contained in:
Junio C Hamano 2016-05-29 18:06:43 -07:00
commit 10184b2718
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
t/t6044-merge-unrelated-index-changes.sh
View file

@ -20,7 +20,7 @@ test_description="merges with unrelated index changes"
# Commit E: renames a->subdir/a, adds subdir/e # Commit E: renames a->subdir/a, adds subdir/e
test_expect_success 'setup trivial merges' ' test_expect_success 'setup trivial merges' '
seq 1 10 >a && test_seq 1 10 >a &&
git add a && git add a &&
test_tick && git commit -m A && test_tick && git commit -m A &&
@ -42,7 +42,7 @@ test_expect_success 'setup trivial merges' '
test_tick && git commit -m C && test_tick && git commit -m C &&
git checkout D && git checkout D &&
seq 2 10 >a && test_seq 2 10 >a &&
echo d >d && echo d >d &&
git add a d && git add a d &&
test_tick && git commit -m D && test_tick && git commit -m D &&