diff options
| author | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-02-13 13:50:05 +0100 |
|---|---|---|
| committer | Kévin Le Gouguec <kevin.legouguec@airbus.com> | 2019-02-13 18:00:05 +0100 |
| commit | 8ecf39d2d854769a5444710bb9358a46bf23789a (patch) | |
| tree | 5d3b4e764cbad4fa547bac506e0fe16cd76b2054 | |
| parent | 35f637aa76a6370aff4f6812d9bfeb9c0c371ec7 (diff) | |
| download | lilliput-ae-implem-8ecf39d2d854769a5444710bb9358a46bf23789a.tar.xz | |
Gestion des conflits lors de l'application des patchs de traces
| -rwxr-xr-x | traces/collect-traces.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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} |