sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Support git config merge.conflictStyle diff3

Browse Source
This commit is contained in:
Ryooooooga
2021-08-22 01:03:05 +09:00
committed by Jesse Duffield
parent aedeba4fe3
commit a0e7604f61
7 changed files with 140 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/gui/mergeconflicts/state_test.go
View File

@ -58,37 +58,57 @@ bar
=======
baz
>>>>>>> branch
<<<<<<< HEAD
foo
||||||| fffffff
bar
=======
baz
>>>>>>> branch
`,
expected: []*mergeConflict{
{
start: 0,
middle: 2,
end: 4,
start: 0,
ancestor: -1,
target: 2,
end: 4,
},
{
start: 6,
middle: 9,
end: 11,
start: 6,
ancestor: -1,
target: 9,
end: 11,
},
{
start: 13,
middle: 15,
end: 17,
start: 13,
ancestor: -1,
target: 15,
end: 17,
},
{
start: 19,
middle: 21,
end: 23,
start: 19,
ancestor: -1,
target: 21,
end: 23,
},
{
start: 25,
middle: 27,
end: 29,
start: 25,
ancestor: -1,
target: 27,
end: 29,
},
{
start: 31,
middle: 34,
end: 36,
start: 31,
ancestor: -1,
target: 34,
end: 36,
},
{
start: 38,
ancestor: 40,
target: 42,
end: 44,
},
},
},