utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-14 17:46:26 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/gui/mergeconflicts
History
Stefan Haller f69eb6dc48 Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLines
2024-05-15 13:27:01 +02:00
..
find_conflicts.go Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLines 2024-05-15 13:27:01 +02:00
find_conflicts_test.go improve merge conflict flow 2022-01-26 14:50:47 +11:00
merge_conflict.go Address feedback 2021-08-25 22:23:55 +10:00
rendering.go Standardise display of range selection across views 2024-01-19 10:47:21 +11:00
state.go migrate patch building tests 2023-02-25 21:37:16 +11:00
state_test.go Support git config merge.conflictStyle diff3 2021-08-25 22:23:55 +10:00