Fixing merge compatibility test

2026-02-11 02:59:34 -06:00 · 2023-03-28 16:41:05 -07:00
parent 7e2113e350
commit 95ab8dc6be
1 changed files with 2 additions and 1 deletions
--- a/integration-tests/compatibility/test_files/bats/compatibility.bats
+++ b/integration-tests/compatibility/test_files/bats/compatibility.bats
@@ -191,8 +191,9 @@ EOF
    if [[ $output =~ "__DOLT__" ]]; then
        run dolt merge other
        echo "status: $status , output: $output \n"
-        [ $status -ne 0 ]
+        [ $status -eq 0 ]
        [[ $output =~ "Merge conflict in abc" ]] || false
+        [[ $output =~ "Automatic merge failed" ]] || false
    else
        # throws a conflict
        dolt merge other