Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/t6044-use-test-seq'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 30 May 2016 01:06:43 +0000
(18:06 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 30 May 2016 01:06:43 +0000
(18:06 -0700)
Test portability fix.
* js/t6044-use-test-seq:
t6044: replace seq by test_seq
t/t6044-merge-unrelated-index-changes.sh
patch
|
blob
|
history
raw
(from parent 1:
b586d8c
)
diff --git
a/t/t6044-merge-unrelated-index-changes.sh
b/t/t6044-merge-unrelated-index-changes.sh
index 20a3ffed6911e3f97427437d861273f33c64051a..01023486c5363da00c9e381fcf1e7d5479c348ae 100755
(executable)
--- 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 &&