t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/builtin/merge.c b/builtin/merge.c
index 7c9d8f2432903eba41e457d4b451ab6b928703a0..428ca247bd17e0f18776b46d40a09282b0b955de 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -63,7 +63,7 @@ static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;
 static int show_progress = -1;
-static int default_to_upstream;
+static int default_to_upstream = 1;
 static const char *sign_commit;
 
 static struct strategy all_strategy[] = {