From a616efd26a62de2424fd677e9c186af252c14b3d Mon Sep 17 00:00:00 2001
From: Nick Tobey <nicktobey@nicktobey.me>
Date: Wed, 26 Apr 2023 12:07:39 -0700
Subject: [PATCH] Update ignore.bats

---
 integration-tests/bats/ignore.bats | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/integration-tests/bats/ignore.bats b/integration-tests/bats/ignore.bats
index 4ac55bfce5..6820a52617 100644
--- a/integration-tests/bats/ignore.bats
+++ b/integration-tests/bats/ignore.bats
@@ -85,7 +85,9 @@ SQL
     run dolt add -A
 
     [ "$status" -eq 1 ]
-    [ "$output" =~ "dolt_ignore has multiple conflicting rules for commit_ignore"
+    [[ "$output" =~ "the table commit_ignore matches conflicting patterns in dolt_ignore" ]] || false
+    [[ "$output" =~ "ignored:     *_ignore" ]] || false
+    [[ "$output" =~ "not ignored: commit_*" ]] || false
 
 }