From 744d1f05dd5a5e39834a57aca310982a3e0f6100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20GNIEWEK?= <gniewek.cedric@free.fr>
Date: Fri, 14 Jan 2022 22:44:51 +0100
Subject: [PATCH] Changed merge parameters to ignore whitespace differences to
 make git merge more tolerant

---
 Git/Project.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Git/Project.cs b/Git/Project.cs
index 69e5d73..0c7ffa9 100644
--- a/Git/Project.cs
+++ b/Git/Project.cs
@@ -54,7 +54,7 @@ public void Clean()
 
         public void Merge(string reference)
         {
-            RunCommand($"merge --quiet --no-edit --no-ff {reference}");
+            RunCommand($"merge --quiet --no-edit --no-ff -Xignore-space-change {reference}");
         }
 
         public void Push(string reference)