summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflicts
AgeCommit message (Expand)Author
2023-02-26migrate merge conflict testsJesse Duffield
2022-03-27refactor integration testsJesse Duffield
2022-01-26add another bisect integration testJesse Duffield
2022-01-26improve merge conflict flowJesse Duffield
2021-04-06update snapshots to include tags comparisonJesse Duffield
2021-04-06update merge conflict testJesse Duffield
2021-04-02more thorough merge conflict integration testJesse Duffield
2020-10-10store everything you need to know about a test in its directoryJesse Duffield
2020-10-10stop using snapshotsCI
2020-10-10fix CIJesse Duffield
2020-10-10add merge conflicts integration testJesse Duffield