This website requires JavaScript.
Explore
Help
Sign In
sysutils
/
lazygit
Watch
1
Star
0
Fork
0
You've already forked lazygit
mirror of
https://github.com/jesseduffield/lazygit.git
synced
2025-10-25 05:37:37 +03:00
Code
Activity
Files
c0cd9dd83535522caa3b7908b33d535df96e04b3
lazygit
/
pkg
/
gui
/
mergeconflicts
History
Jesse Duffield
44d08edfb0
Address feedback
2021-08-25 22:23:55 +10:00
..
find_conflicts_test.go
Support
git config merge.conflictStyle diff3
2021-08-25 22:23:55 +10:00
find_conflicts.go
Support
git config merge.conflictStyle diff3
2021-08-25 22:23:55 +10:00
merge_conflict.go
Address feedback
2021-08-25 22:23:55 +10:00
rendering.go
Minor refactor
2021-08-25 22:23:55 +10:00
state_test.go
Support
git config merge.conflictStyle diff3
2021-08-25 22:23:55 +10:00
state.go
Minor refactor
2021-08-25 22:23:55 +10:00
