Ryooooooga 3b5a019e1a feat(merge_panel): Add open/edit files in merge conflict panel

2022-04-06 08:27:03 +10:00

..

find_conflicts_test.go

improve merge conflict flow

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

find_conflicts.go

update linters

2022-03-19 12:12:57 +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

feat(merge_panel): Add open/edit files in merge conflict panel

2022-04-06 08:27:03 +10:00