From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 May 2026 05:15:43 +0000 (+0900)
Subject: Merge branch 'pb/doc-diff-format-updates'
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=49a06cc814b689610ef2e8fcfe7663fc295448fe;p=thirdparty%2Fgit.git

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
---

49a06cc814b689610ef2e8fcfe7663fc295448fe