starred/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-08-29 10:20:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,386 Commits 56 Branches 246 Tags
github-release-notes
Commit Graph
8 Commits
Author SHA1 Message Date
Jesse Duffield c8cc18920f improve merge conflict flow 2022-01-26 14:50:47 +11:00
Jesse Duffield f08fdb2873 Minor refactor 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield cf8ded0b79 add mergeConflict#hasAncestor 2021-08-25 22:23:55 +10:00
RyoooooogaandJesse Duffield a0e7604f61 Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00
Jesse Duffield d626bcac00 color fixups 2021-08-01 16:14:56 +10:00
Jesse Duffield 117c0bd4f7 simplify code a bit 2021-07-31 17:33:13 +10:00
mjarkk 79848087bc Switch to github.com/gookit/color for terminal colors 2021-07-30 15:14:46 +02:00
Jesse Duffield 98375dc902 refactor merge panel 2021-04-18 18:58:09 +10:00