go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-03 15:02:52 +02:00
Code Issues Releases Activity
lazygit/pkg/gui/mergeconflicts
History
Jesse Duffield c8cc18920f improve merge conflict flow
2022-01-26 14:50:47 +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
improve merge conflict flow
2022-01-26 14:50:47 +11:00