6 Commits

Author	SHA1	Message	Date
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Ryooooooga	0af0e66586	Fix panic in merge conflict	2021-08-21 18:34:30 +09: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
Jesse Duffield	258eedb38c	refactor	2021-06-02 20:33:52 +10:00