* Fix merge test for __DOLT_1__
* tree.ThreeWayMerge always calls callback when key collision occurs
* add keyless support for new format merge and other merge related tables
* newline of doom
* unskip more bats
* empty
* skip blame.bats and remotes-aws.bats
* use database tempfile for mrEnv
* sql-server bats for fetch/working dir issue
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* snazzier name
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>