mirror of
https://github.com/dolthub/dolt.git
synced 2026-05-05 11:21:58 -05:00
6488344abb
* CALL DOLT_MERGE now returns fast_forward and conflicts columns * fix tests * fix sql integration tests * fix sql-merge.bats * pr comment