Merge branch 'lt/diff-tree'

* lt/diff-tree:
combine-diff: move formatting logic to show_combined_diff()
combined-diff: use diffcore before intersecting paths.
diff-tree -c raw output

diff --combined diff-files.c
index c96ad35fb6cdb74494d1fdd93e1f125412ee024c,7db5ce6407b9755e42445a7cf43d6dc5615bf3e7..574294f30254c3082820aa678b6df353540fefbf
--- 1/diff-files.c
--- 2/diff-files.c
+++ b/diff-files.c
@@@ -88,9 -88,8 +88,8 @@@ int main(int argc, const char **argv
                }
                argv++; argc--;
        }
-       if (combine_merges) {
+       if (dense_combined_merges)
                diff_options.output_format = DIFF_FORMAT_PATCH;
-       }
  
        /* Find the directory, and set up the pathspec */
        pathspec = get_pathspec(prefix, argv + 1);
@@@ -166,7 -165,8 +165,8 @@@
                        if (combine_merges && num_compare_stages == 2) {
                                show_combined_diff(&combine.p, 2,
                                                   dense_combined_merges,
-                                                  NULL);
+                                                  NULL,
+                                                  &diff_options);
                                free(combine.p.path);
                                continue;
                        }
@@@ -191,7 -191,7 +191,7 @@@
                        show_file('-', ce);
                        continue;
                }
 -              changed = ce_match_stat(ce, &st);
 +              changed = ce_match_stat(ce, &st, 0);
                if (!changed && !diff_options.find_copies_harder)
                        continue;
                oldmode = ntohl(ce->ce_mode);