From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Nov 2008 19:57:31 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa14a0c3f191ee4df7344eed119be5b4a527a0ff;p=git.git

Merge branch 'maint'

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

aa14a0c3f191ee4df7344eed119be5b4a527a0ff
diff --cc builtin-diff.c
index 7ceceeb6f,26cf67859..b90d8bcdb
--- a/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