Merge branch 'en/combined-all-paths'

Output from "diff --cc" did not show the original paths when the
merge involved renames.  A new option adds the paths in the
original trees to the output.

* en/combined-all-paths:
log,diff-tree: add --combined-all-paths option

diff --cc Documentation/git-diff-tree.txt
Simple merge

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc builtin/diff-tree.c
Simple merge

diff --cc combine-diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge