[no-release-notes] unskip more bats (#3737)

* 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
This commit is contained in:
Dhruv Sringari
2022-07-01 17:00:42 -07:00
committed by GitHub
parent 45601fbf1a
commit 24cac1f6c4
39 changed files with 1368 additions and 1418 deletions
-1
View File
@@ -114,7 +114,6 @@ teardown() {
}
@test "sql-shell: validate string formatting" {
skip_nbf_dolt_1
dolt sql <<SQL
CREATE TABLE test2 (
str varchar(256) NOT NULL,