Merge git://git.bogomips.org/git-svn

[git.git] / builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index 82d4ddabd85072829199fe8dc17c2de15691dac2..7ceceeb6ff49d60468293941b5f37141e8fc01b9 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -300,6 +300,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        }
        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