diff options
Diffstat (limited to 't/t6012-rev-list-simplify.sh')
| -rwxr-xr-x | t/t6012-rev-list-simplify.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index b89cd6b..2a0fbb8 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -71,7 +71,7 @@ test_expect_success setup ' note J && git checkout master && - test_tick && git merge -m "Coolest" unrelated && + test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated && note K && echo "Immaterial" >elif && |