go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-28 09:08:41 +02:00
Code Issues Releases Activity
36e57d16bd
lazygit/pkg/gui/mergeconflicts
History
Jesse Duffield dd1bf629b8 migrate patch building tests
2023-02-25 21:37:16 +11: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 migrate patch building tests 2023-02-25 21:37:16 +11:00