tree 863c9c7050e0fc50e8bbfb700fa6a8948f7f6de8
parent 436d4e5b14df49870a897f64fe92c0ddc7017e4c
parent 0c6ee971fbed2cdd4a88721e116cc3867503418e
author Junio C Hamano <gitster@pobox.com> 1712946698 -0700
committer Junio C Hamano <gitster@pobox.com> 1712946698 -0700

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