go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
Code Issues Releases Activity
d991d74b06
lazygit/pkg/gui/mergeconflicts
History
Jesse Duffield c084abb378 move more view model logic into the files view model
2022-03-17 19:13:40 +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 move more view model logic into the files view model 2022-03-17 19:13:40 +11:00