Jesse Duffield 44d08edfb0 Address feedback

2021-08-25 22:23:55 +10:00

..

find_conflicts_test.go

Support git config merge.conflictStyle diff3

2021-08-25 22:23:55 +10:00

find_conflicts.go

Support git config merge.conflictStyle diff3

2021-08-25 22:23:55 +10:00

merge_conflict.go

Address feedback

2021-08-25 22:23:55 +10:00

rendering.go

Minor refactor

2021-08-25 22:23:55 +10:00

state_test.go

Support git config merge.conflictStyle diff3

2021-08-25 22:23:55 +10:00

state.go

Minor refactor

2021-08-25 22:23:55 +10:00