From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Nov 2024 03:29:44 +0000 (+0900)
Subject: Merge branch 'kh/merge-tree-doc' into maint-2.47
X-Git-Tag: v2.47.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd78021b91902dd85d07bedbd040ea057c6ffeba;p=thirdparty%2Fgit.git

Merge branch 'kh/merge-tree-doc' into maint-2.47

Docfix.
cf. <CABPp-BE=JfoZp19Va-1oF60ADBUibGDwDkFX-Zytx7A3uJ__gg@mail.gmail.com>

* kh/merge-tree-doc:
  doc: merge-tree: improve example script
---

fd78021b91902dd85d07bedbd040ea057c6ffeba