summaryrefslogtreecommitdiffstats
path: root/src/handlers/merge_conflict.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/handlers/merge_conflict.rs')
-rw-r--r--src/handlers/merge_conflict.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/handlers/merge_conflict.rs b/src/handlers/merge_conflict.rs
index 926d7a3c..31cb2bda 100644
--- a/src/handlers/merge_conflict.rs
+++ b/src/handlers/merge_conflict.rs
@@ -200,6 +200,7 @@ fn write_diff_header(
painter.writer,
&text,
&text,
+ "",
&config.decorations_width,
style,
decoration_ansi_term_style,