Merge branch 'pb/doc-diff-format-updates'

Doc updates. * pb/doc-diff-format-updates: diff-format.adoc: mode and hash are 0* for unmerged paths from index only diff-format.adoc: 'git diff-files' prints two lines for unmerged files diff-format.adoc: remove mention of diff-tree specific output