tree babcb4361b6a2434113fb920cbc22ea2c887ad92
parent 342990c7aaef5ac645e89101cb84569caf64baf4
author Johannes Schindelin <johannes.schindelin@gmx.de> 1712923840 +0000
committer Junio C Hamano <gitster@pobox.com> 1712938243 -0700

merge-tree: fix argument type of the `--merge-base` option

In 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I
taught `git merge-tree` to perform three-way merges on trees. This
commit even changed the manual page to state that the `--merge-base`
option takes a tree-ish rather than requiring a commit.

But I forgot to adjust the in-program help text. This patch fixes that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>