From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Apr 2024 18:31:38 +0000 (-0700)
Subject: Merge branch 'js/merge-tree-3-trees'
X-Git-Tag: v2.45.0-rc0~29
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=d842e22ebbb2d70e11f8055c5cd7d1d4e1a90e2e

Merge branch 'js/merge-tree-3-trees'

Match the option argument type in the help text to the correct type
updated by a recent series.

* js/merge-tree-3-trees:
  merge-tree: fix argument type of the `--merge-base` option
---

d842e22ebbb2d70e11f8055c5cd7d1d4e1a90e2e