mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-17 03:00:45 -06:00
Code Issues Packages Projects Releases 120 Wiki Activity
21,807 Commits 61 Branches 590 Tags
d256c49ceedc3a1985c2d50a67d7dcbeb16bd4c1
Commit Graph

6 Commits

Author SHA1 Message Date
James Cor
ea9839f524 return commit hash for dolt_merge() when --no-ff is not specified (#6281) 2023-07-10 02:12:01 -07:00
James Cor
4d2dbb9746 add hash column to result set for dolt_merge(..., '--no-ff') (#6163) 2023-06-16 01:39:03 -07:00
Daylon Wilkins
8aeb1c659e Removed deprecated dolt functions 2023-01-03 02:13:37 -08:00
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