apply: --3way with add/add conflict

diff --git a/t/perf/p4000-diff-algorithms.sh b/t/perf/p4000-diff-algorithms.sh
index d6e505c78c26babc6173db2b853f829444290d1a..7e00c9da47d7a37e498a2b2326578f79a4c33e4f 100755 (executable)
--- a/t/perf/p4000-diff-algorithms.sh
+++ b/t/perf/p4000-diff-algorithms.sh
@@ -7,7 +7,7 @@ test_description="Tests diff generation performance"
 test_perf_default_repo
 
 test_perf 'log -3000 (baseline)' '
-       git log -1000 >/dev/null
+       git log -3000 >/dev/null
 '
 
 test_perf 'log --raw -3000 (tree-only)' '