diff options
Diffstat (limited to 'merge_panel.go')
| -rw-r--r-- | merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge_panel.go b/merge_panel.go index 6602dbbf1..f5ca12a23 100644 --- a/merge_panel.go +++ b/merge_panel.go @@ -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 } |