This website requires JavaScript.
Explore
Help
Register
Sign In
go
/
lazygit
Watch
1
Star
0
Fork
0
You've already forked lazygit
mirror of
https://github.com/jesseduffield/lazygit.git
synced
2025-01-26 05:37:18 +02:00
Code
Issues
Releases
Activity
lazygit
/
pkg
/
gui
/
mergeconflicts
History
Ryooooooga
6ca42ff720
Fix
pick all hunks
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
rendering.go
add mergeConflict#hasAncestor
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
Fix
pick all hunks
2021-08-25 22:23:55 +10:00
