go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00
Code Issues Releases Activity

Obtain branches in a more robust way. Begin refactor work on gitcommands

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-10 21:33:49 +10:00
parent 3f89b5bf71
commit d08241b2ea
12 changed files with 221 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge_panel.go
View File

@ -56,7 +56,7 @@ func coloredConflictFile(content string, conflicts []conflict, conflictIndex int
if i == conflict.end && len(remainingConflicts) > 0 {
conflict, remainingConflicts = shiftConflict(remainingConflicts)
}
outputBuffer.WriteString(coloredString(line, colour) + "\n")
outputBuffer.WriteString(coloredStringDirect(line, colour) + "\n")
}
return outputBuffer.String(), nil
}