diff options
| -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} |