From 562d0541a1fb04ba9ff7118da8529a5b0c1f83c1 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 3 May 2026 16:35:21 +0200 Subject: [PATCH] Fix linter warning about inefficient string concatenation --- pkg/gui/mergeconflicts/rendering.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/gui/mergeconflicts/rendering.go b/pkg/gui/mergeconflicts/rendering.go index e57754e4b..c71c12d37 100644 --- a/pkg/gui/mergeconflicts/rendering.go +++ b/pkg/gui/mergeconflicts/rendering.go @@ -24,7 +24,8 @@ func ColoredConflictFile(state *State) string { if i == conflict.end && len(remainingConflicts) > 0 { conflict, remainingConflicts = shiftConflict(remainingConflicts) } - outputBuffer.WriteString(textStyle.Sprint(line) + "\n") + outputBuffer.WriteString(textStyle.Sprint(line)) + outputBuffer.WriteByte('\n') } return outputBuffer.String() }