mirror of
https://github.com/dolthub/dolt.git
synced 2026-02-14 01:07:08 -06:00
* dolt reset --hard clears any merge state * fix call DOLT_RESET to match new behavior, add sqlengine tests * uncomment conflicted case
* dolt reset --hard clears any merge state * fix call DOLT_RESET to match new behavior, add sqlengine tests * uncomment conflicted case