mirror of
https://github.com/dolthub/dolt.git
synced 2026-03-16 23:53:17 -05:00
* CALL DOLT_MERGE now returns fast_forward and conflicts columns * fix tests * fix sql integration tests * fix sql-merge.bats * pr comment
* CALL DOLT_MERGE now returns fast_forward and conflicts columns * fix tests * fix sql integration tests * fix sql-merge.bats * pr comment