mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-16 23:53:17 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity
14,176 Commits 161 Branches 617 Tags
ede8deba4da2ac3849c53e90d0e583cfc2d1700a
Commit Graph

3 Commits

Author SHA1 Message Date
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
Vinai Rachakonda
4a5a033c5d Expand Client Tests to include sql functions (#2303) 2021-10-29 10:18:38 -07:00
Dustin Brown
503665c32c /integration-tests: move mysql-client-tests to integration-tests 2021-03-15 12:53:14 -07:00