3 Commits

Author	SHA1	Message	Date
Jesse Duffield	eb056576cf	fix integration test	2022-03-17 19:13:40 +11:00
Jesse Duffield	a2318d75b5	fix some things	2022-03-17 19:13:40 +11:00
Jesse Duffield	fa2e7ae1e7	show only merge conflict files when there are merge conflicts	2022-01-26 20:28:32 +11:00