Fix result expectations in mysql-client-tests

dolthub · Jan 18, 2024 · fb440ba · fb440ba
1 parent 476dfd7
commit fb440ba
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/integration-tests/mysql-client-tests/node/workbenchTests/merge.js b/integration-tests/mysql-client-tests/node/workbenchTests/merge.js
@@ -14,7 +14,7 @@ export const mergeTests = [
   {
     q: `CALL DOLT_MERGE(:branchName, "--no-ff", "-m", :commitMsg)`,
     p: { branchName: "mybranch", commitMsg: "Merge mybranch into main" },
-    res: [{ hash: "", fast_forward: 0, conflicts: 0 }],
+    res: [{ hash: "", fast_forward: 0, conflicts: 0, message: "merge successful" }],
     matcher: mergeMatcher,
   },
   {