5 Commits

Author	SHA1	Message	Date
Jesse Duffield	1abb3cd566	more thorough merge conflict integration test	2021-04-02 11:09:12 +11:00
Jesse Duffield	88f2a66a51	store everything you need to know about a test in its directory	2020-10-10 00:23:01 +11:00
CI	a9049b4a82	stop using snapshots	2020-10-10 00:23:01 +11:00
Jesse Duffield	2724f3888a	fix CI	2020-10-10 00:23:01 +11:00
Jesse Duffield	18f8c3d00a	add merge conflicts integration test	2020-10-10 00:23:01 +11:00