From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Feb 2025 22:19:36 +0000 (-0800)
Subject: Merge branch 'pw/merge-tree-stdin-deadlock-fix'
X-Git-Tag: v2.49.0-rc0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b07c152dfce52663795fe9b4e1ed5626bfda455;p=thirdparty%2Fgit.git

Merge branch 'pw/merge-tree-stdin-deadlock-fix'

"git merge-tree --stdin" has been improved (including a workaround
for a deadlock).

* pw/merge-tree-stdin-deadlock-fix:
  merge-tree: fix link formatting in html docs
  merge-tree: improve docs for --stdin
  merge-tree: only use basic merge config
  merge-tree: remove redundant code
  merge-tree --stdin: flush stdout to avoid deadlock
---

9b07c152dfce52663795fe9b4e1ed5626bfda455