4 Commits

Author	SHA1	Message	Date
jiepeng	bc8050d8ac	typo	2022-09-17 15:10:41 -07:00
jiepeng	b8900baf1a	remove deprecated calls	2022-09-17 15:10:41 -07:00
Jesse Duffield	7410acd1aa	move merge conflicts code into controller	2022-08-07 11:16:03 +10:00
Jesse Duffield	445a625b56	rename merging context to mergeConflicts	2022-08-06 18:05:00 +10:00