mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-17 10:21:02 -06:00
Code Issues Packages Projects Releases 120 Wiki Activity

CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564)

Browse Source 
* CALL DOLT_MERGE now returns fast_forward and conflicts columns

* fix tests

* fix sql integration tests

* fix sql-merge.bats

* pr comment
This commit is contained in:
Dhruv Sringari
2022-06-07 17:03:46 -07:00
committed by GitHub
parent 841b294841
commit 6488344abb
16 changed files with 139 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/mysql-client-tests/java/MySQLConnectorTest.java
View File

@@ -52,7 +52,7 @@ public class MySQLConnectorTest {
"1",
"1",
"0",
"1",
"0",
"3"
};