Merge branch 'jk/t5562-perl-path-fix'

diff --git a/range-diff.c b/range-diff.c
index 3958720f004ebe9ba027cd6097a7cd3ce41e3d73..767af8c5bb5617016ba2c341334c05696fdcbcc1 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -461,7 +461,8 @@ int show_range_diff(const char *range1, const char *range2,
                struct strbuf indent = STRBUF_INIT;
 
                memcpy(&opts, diffopt, sizeof(opts));
-               opts.output_format = DIFF_FORMAT_PATCH;
+               if (!opts.output_format)
+                       opts.output_format = DIFF_FORMAT_PATCH;
                opts.flags.suppress_diff_headers = 1;
                opts.flags.dual_color_diffed_diffs = dual_color;
                opts.output_prefix = output_prefix_cb;