4 Commits

Author	SHA1	Message	Date
Jesse Duffield	ff3c5d331e	migrate merge conflict tests	2023-02-26 11:22:24 +11:00
Jesse Duffield	93b9e1bd19	migrate merge conflict undo test	2023-02-19 15:48:09 +11:00
Jesse Duffield	b5e325b0a4	migrate revert merge test	2023-02-19 15:48:09 +11:00
Jesse Duffield	74acb3e86a	add integration tests for cherry picking	2022-09-16 22:15:16 -07:00