mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-23 03:00:00 -06:00
Code Issues Packages Projects Releases 122 Wiki Activity

Fixing node client test

Browse Source
This commit is contained in:
Jason Fulghum
2023-06-13 14:00:17 -07:00
parent fcc0db9467
commit 558bdca26d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/mysql-client-tests/node/workbenchTests/merge.js
View File

@@ -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: [{ fast_forward: 1, conflicts: 0 }],
res: [{ fast_forward: 0, conflicts: 0 }],
},
{
q: `SELECT * FROM DOLT_LOG(:refName, '--parents') LIMIT :limit OFFSET :offset`,