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
bc044c64b2
lazygit/pkg/gui/mergeconflicts
History
Harrison Jones e478c254d4 Handle alternate merge conflict format; add tests
2021-05-30 13:50:42 +10:00
..
rendering.go refactor merge panel 2021-04-18 18:58:09 +10:00
state_test.go Handle alternate merge conflict format; add tests 2021-05-30 13:50:42 +10:00
state.go Handle alternate merge conflict format; add tests 2021-05-30 13:50:42 +10:00