Jesse Duffield 84a1992055 better locking of merge panel state

2022-01-27 21:25:04 +11:00

..

find_conflicts_test.go

improve merge conflict flow

2022-01-26 14:50:47 +11:00

find_conflicts.go

improve merge conflict flow

2022-01-26 14:50:47 +11:00

merge_conflict.go

Address feedback

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

rendering.go

improve merge conflict flow

2022-01-26 14:50:47 +11:00

state_test.go

Support git config merge.conflictStyle diff3

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

state.go

better locking of merge panel state

2022-01-27 21:25:04 +11:00