This website requires JavaScript.
Explore
Help
Sign In
sysutils
/
lazygit
Watch
1
Star
0
Fork
0
mirror of
https://github.com/jesseduffield/lazygit.git
synced
2026-11-21 04:46:29 +03:00
Code
Activity
Files
gh-integration-2
lazygit
/
pkg
/
gui
/
mergeconflicts
T
Add File
New File
Upload File
Apply Patch
Copy Permalink
Download directory as ZIP
Download directory as TAR.GZ
History
Jesse Duffield
7410acd1aa
move merge conflicts code into controller
2022-08-07 11:16:03 +10:00
..
find_conflicts_test.go
improve merge conflict flow
2022-01-26 14:50:47 +11:00
find_conflicts.go
update linters
2022-03-19 12:12:57 +11:00
merge_conflict.go
Address feedback
2021-08-25 22:23:55 +10:00
rendering.go
improve merge conflict flow
2022-01-26 14:50:47 +11:00
state_test.go
Support
git config merge.conflictStyle diff3
2021-08-25 22:23:55 +10:00
state.go
move merge conflicts code into controller
2022-08-07 11:16:03 +10:00