From 95ab8dc6be0cbff2d4b36db721b80f6853421046 Mon Sep 17 00:00:00 2001
From: Jason Fulghum <jason@dolthub.com>
Date: Tue, 28 Mar 2023 16:41:05 -0700
Subject: [PATCH] Fixing merge compatibility test

---
 .../compatibility/test_files/bats/compatibility.bats           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration-tests/compatibility/test_files/bats/compatibility.bats b/integration-tests/compatibility/test_files/bats/compatibility.bats
index 7ad20fdf44..fc4d3be2d9 100755
--- 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