diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats index cf2dd0b4f0aba0276b933732084e4f60c9a6c80e..f2af693757d0796d14e78df91e863c903f9e6426 100755 --- a/tests/merge-conflict.bats +++ b/tests/merge-conflict.bats @@ -13,6 +13,9 @@ export repo="$BATS_TMPDIR/testrepo" git commit -m "Initial commit." git checkout -b master2 git checkout -b no-conflict + echo 1 > file2 + git add file2 + git commit -m "Another not-conflicting commit." git checkout -b conflict echo 2 > file git commit file -m "Conflict with master." @@ -40,6 +43,12 @@ export repo="$BATS_TMPDIR/testrepo" merge-conflict master2 } +@test "Empty patch" { + cd "$repo" + git checkout master2 || true + merge-conflict +} + @test "Conflict" { cd "$repo" git checkout conflict || true