Files
dolt/integration-tests/mysql-client-tests/java
Dhruv Sringari 6488344abb CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564)
* CALL DOLT_MERGE now returns fast_forward and conflicts columns

* fix tests

* fix sql integration tests

* fix sql-merge.bats

* pr comment
2022-06-07 17:03:46 -07:00
..