summaryrefslogtreecommitdiff
path: root/t/t6101-rev-parse-parents.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
-rwxr-xr-xt/t6101-rev-parse-parents.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 10b1452766..1c6952d049 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
git checkout --orphan tmp &&
test_commit start2 &&
git checkout master &&
- git merge -m next start2 &&
+ git merge -m next --allow-unrelated-histories start2 &&
test_commit final &&
test_seq 40 |