Merge branch 'maint'

diff --git a/builtin-log.c b/builtin-log.c
index 82ea07b1bd7ba03991c1fb3cca40796f21dbaab7..b164717379627b7bfc303bd3fdf360ecd2db152d 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -60,6 +60,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
                } else
                        die("unrecognized argument: %s", arg);
        }
+       DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
 }
 
 /*