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
a533f8e1a5
lazygit/pkg/gui/mergeconflicts
History
Ryooooooga a533f8e1a5 simplify merge panel logic
2021-08-25 22:23:55 +10:00
..
find_conflicts_test.go Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
find_conflicts.go Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
rendering.go add mergeConflict#hasAncestor 2021-08-25 22:23:55 +10:00
state_test.go Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
state.go simplify merge panel logic 2021-08-25 22:23:55 +10:00