From 8ecf39d2d854769a5444710bb9358a46bf23789a Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Wed, 13 Feb 2019 13:50:05 +0100
Subject: Gestion des conflits lors de l'application des patchs de traces

---
 traces/collect-traces.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'traces')

diff --git a/traces/collect-traces.sh b/traces/collect-traces.sh
index d738a1b..3d9d76b 100755
--- a/traces/collect-traces.sh
+++ b/traces/collect-traces.sh
@@ -11,7 +11,7 @@ patch=traces/${trace_type}.patch
 
 d=$(mktemp -d)
 
-git apply ${patch}
+git apply --3way ${patch}
 
 for variant_dir in test/{i,ii}-{128,192,256}
 do
@@ -23,4 +23,4 @@ tar czf results/${trace_type}.tgz -C ${d} .
 
 rm -r ${d}
 
-git apply --reverse ${patch}
+git apply --3way --reverse ${patch}
-- 
cgit v1.2.3