5 Commits

Author	SHA1	Message	Date
Jesse Duffield	fdff2dec79	Remove redundant variable dedeclarations ... In go 1.22, loop variables are redeclared with each iteration of the loop, rather than simple updated on each iteration. This means that we no longer need to manually redeclare variables when they're closed over by a function.	2024-05-19 16:38:21 +10:00
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Jesse Duffield	6d91661d5e	prevent closure issue	2021-06-05 13:54:05 +10:00
Cristian Betivu	fd38ad8096	More generic merge conflict detection	2021-06-05 13:53:25 +10:00
Harrison Jones	e478c254d4	Handle alternate merge conflict format; add tests	2021-05-30 13:50:42 +10:00