11 Commits

Author	SHA1	Message	Date
Jesse Duffield	84a1992055	better locking of merge panel state	2022-01-27 21:25:04 +11:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
Jesse Duffield	f08fdb2873	Minor refactor	2021-08-25 22:23:55 +10:00
Ryooooooga	6ca42ff720	Fix pick all hunks	2021-08-25 22:23:55 +10:00
Ryooooooga	a533f8e1a5	simplify merge panel logic	2021-08-25 22:23:55 +10:00
Ryooooooga	cf8ded0b79	add mergeConflict#hasAncestor	2021-08-25 22:23:55 +10:00
Ryooooooga	73548fa15f	Fix conflict resolution	2021-08-25 22:23:55 +10:00
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Jesse Duffield	258eedb38c	refactor	2021-06-02 20:33:52 +10:00
Harrison Jones	e478c254d4	Handle alternate merge conflict format; add tests	2021-05-30 13:50:42 +10:00
Jesse Duffield	98375dc902	refactor merge panel	2021-04-18 18:58:09 +10:00