diff --git a/combine-diff.c b/combine-diff.c
index e519583650c16ab4077c834f409658c63b6d5a06..9bd27f82ec1d7c313987325a4948a5eed8c9b799 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
diffopts = *opt;
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
+ diffopts.with_raw = 0;
diffopts.recursive = 1;
/* count parents */
num_paths++;
}
if (num_paths) {
+ if (opt->with_raw) {
+ int saved_format = opt->output_format;
+ opt->output_format = DIFF_FORMAT_RAW;
+ for (p = paths; p; p = p->next) {
+ if (show_combined_diff(p, num_parent, dense,
+ header, opt))
+ header = NULL;
+ }
+ opt->output_format = saved_format;
+ putchar(opt->line_termination);
+ }
for (p = paths; p; p = p->next) {
if (show_combined_diff(p, num_parent, dense,
header, opt))