From f062e1dcda7068be1e8b3cdec28f122dd48e6634 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 9 Feb 2020 16:40:32 +1100
Subject: [PATCH] ignore carriage returns

---
 pkg/gui/gui.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 371dfe7dd..174e124af 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -508,6 +508,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		v.Title = gui.Tr.SLocalize("DiffTitle")
 		v.Wrap = true
 		v.FgColor = textColor
+		v.IgnoreCarriageReturns = true
 	}
 
 	hiddenViewOffset := 0
@@ -522,6 +523,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		secondaryView.Title = gui.Tr.SLocalize("DiffTitle")
 		secondaryView.Wrap = true
 		secondaryView.FgColor = gocui.ColorWhite
+		secondaryView.IgnoreCarriageReturns = true
 	}
 
 	if v, err := g.SetView("status", 0, 0, leftSideWidth, vHeights["status"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {