go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
Code Issues Releases Activity
258eedb38c
lazygit/pkg/gui/mergeconflicts
History
Jesse Duffield 258eedb38c refactor
2021-06-02 20:33:52 +10:00
..
find_conflicts_test.go refactor 2021-06-02 20:33:52 +10:00
find_conflicts.go refactor 2021-06-02 20:33:52 +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 refactor 2021-06-02 20:33:52 +10:00