Merge branch 'maint'

* maint:
  Teach "git diff" to honour --[no-]ext-diff

diff --cc builtin-diff.c
index 7ceceeb6ff49d60468293941b5f37141e8fc01b9,26cf6785918300f3a0998a1811adb71ec6ec7b73..b90d8bcdb6e732729432d8764b429304474bb3e8
--- 1/builtin-diff.c
--- 2/builtin-diff.c
+++ b/builtin-diff.c
@@@ -298,9 -301,8 +301,9 @@@ int cmd_diff(int argc, const char **arg
                if (diff_setup_done(&rev.diffopt) < 0)
                        die("diff_setup_done failed");
        }
-       DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
+ 
        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
 +      DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
  
        /*
         * If the user asked for our exit code then don't start a

diff --cc t/t4020-diff-external.sh
Simple merge