Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6044: replace seq by test_seq
author
Johannes Sixt
<j6t@kdbg.org>
Wed, 18 May 2016 05:51:39 +0000
(07:51 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 18 May 2016 15:48:06 +0000
(08:48 -0700)
seq is not available everywhere.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6044-merge-unrelated-index-changes.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a6ee883
)
diff --git
a/t/t6044-merge-unrelated-index-changes.sh
b/t/t6044-merge-unrelated-index-changes.sh
index eed5d95c1343b4061c9e0b1e77cb0b6079773421..782a1954ee70bde7bfd76840e885bbe61aab8436 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 &&