Overhaul of merge conflict tests#414

lukaskubanek wants to merge 20 commits into

pointfreeco:mainpointfreeco/sqlite-data:mainfrom

structuredpath:merge-conflict-testsstructuredpath/sqlite-data:merge-conflict-testsCopy head branch name to clipboard