13 Commits

Author	SHA1	Message	Date
Ryooooooga	0af0e66586	Fix panic in merge conflict	2021-08-21 18:34:30 +09:00
Jesse Duffield	d626bcac00	color fixups	2021-08-01 16:14:56 +10:00
Jesse Duffield	117c0bd4f7	simplify code a bit	2021-07-31 17:33:13 +10:00
mjarkk	79848087bc	Switch to github.com/gookit/color for terminal colors	2021-07-30 15:14:46 +02:00
Jesse Duffield	6d91661d5e	prevent closure issue	2021-06-05 13:54:05 +10:00
Jesse Duffield	90983aae65	not importing regexp	2021-06-05 13:53:25 +10:00
Jesse Duffield	f71b23b890	more explicit	2021-06-05 13:53:25 +10:00
Cristian Betivu	05a23f0e1e	Discard value after END marker	2021-06-05 13:53:25 +10:00
Cristian Betivu	fd38ad8096	More generic merge conflict detection	2021-06-05 13:53:25 +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
Jesse Duffield	eeeef9ca86	refactor	2021-04-02 11:09:12 +11:00