1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-24 05:36:19 +02:00

4 Commits

Author SHA1 Message Date
Jesse Duffield
258eedb38c refactor 2021-06-02 20:33:52 +10:00
Harrison Jones
e478c254d4 Handle alternate merge conflict format; add tests 2021-05-30 13:50:42 +10:00
Jesse Duffield
98375dc902 refactor merge panel 2021-04-18 18:58:09 +10:00
Jesse Duffield
eeeef9ca86 refactor 2021-04-02 11:09:12 +11:00