go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity
6,392 Commits 46 Branches 225 Tags
97aa7a04e66c593ef7c4fbc3d8871a135e99d06a
Commit Graph

3 Commits

Author SHA1 Message Date
Jesse Duffield
c8cc18920f improve merge conflict flow 2022-01-26 14:50:47 +11:00
Ryooooooga
a0e7604f61 Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
Jesse Duffield
258eedb38c refactor 2021-06-02 20:33:52 +10:00