mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-29 11:31:28 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity
15,674 Commits 305 Branches 629 Tags
3efbfdfad2323152c1b965db7efe4fef23cbcbfd
Commit Graph

7 Commits

Author SHA1 Message Date
jennifersp 6886a8721f commit merge if no conflict (#4105) 2022-08-23 12:38:12 -07:00
Andy Arthur f3613569e2 fixup bats 2022-07-15 12:22:28 -07:00
Andy Arthur 6300afcc70 bats fixes 2022-07-13 16:03:12 -07:00
Dhruv Sringari 24cac1f6c4 [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
 2022-07-01 17:00:42 -07:00
Andy Arthur 01587c8c20 more BATS skips for __DOLT_1__ 2022-05-10 14:08:47 -07:00
Dustin Brown 5371ed510f /integration-tests/bats: fix bats tests 2021-09-23 14:30:43 -07:00
Dustin Brown 61b06450b1 /integration-tests: move bats 2021-03-15 14:04:40 -07:00