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 --cc diff-files.c
Simple merge