summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-12 21:50:58 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-12 21:50:58 -0800
commit72b6157aa847615a778ac9950e87dde109afa50c (patch)
tree691238c7db13ab8a743807731a44e3c493973c25 /builtin-diff.c
parent459d60084fa463203d0adfc99cbf5d6fcd7edd43 (diff)
parenta79b8b6623288f7d5409ad749cc6553976a4f0e8 (diff)
downloadgit-72b6157aa847615a778ac9950e87dde109afa50c.tar.gz
Merge branch 'jk/diff-convfilter'
* jk/diff-convfilter: enable textconv for diff in verbose status/commit wt-status: load diff ui config only textconv regular files userdiff: require explicitly allowing textconv refactor userdiff textconv code Conflicts: t/t4030-diff-textconv.sh
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index 82d4ddabd8..7ceceeb6ff 100644
--- 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