Merge branch 'jc/pull-signed-tag'

* jc/pull-signed-tag:
  merge: use editor by default in interactive sessions

Conflicts:
	Documentation/merge-options.txt

diff --cc builtin/merge.c
index 3a451727d0e637ae197c9a1193435e57e84e6c58,0006175d15a341793392296a8097cef905f2fa63..bfb75476aab154e430d6247073e0bbcd83c992f6
--- 1/builtin/merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -46,12 -44,11 +46,12 @@@ static const char * const builtin_merge
        NULL
  };
  
 -static int show_diffstat = 1, shortlog_len, squash;
 +static int show_diffstat = 1, shortlog_len = -1, squash;
  static int option_commit = 1, allow_fast_forward = 1;
- static int fast_forward_only, option_edit;
+ static int fast_forward_only, option_edit = -1;
  static int allow_trivial = 1, have_message;
 -static struct strbuf merge_msg;
 +static int overwrite_ignore = 1;
 +static struct strbuf merge_msg = STRBUF_INIT;
  static struct commit_list *remoteheads;
  static struct strategy **use_strategies;
  static size_t use_strategies_nr, use_strategies_alloc;

diff --cc t/test-lib.sh
Simple merge