From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Dec 2024 01:04:53 +0000 (+0900)
Subject: Merge branch 'pb/mergetool-errors'
X-Git-Tag: v2.48.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cd1e2e1a0350a3b6cbc4bcd268f0cbbe8c89687;p=thirdparty%2Fgit.git

Merge branch 'pb/mergetool-errors'

End-user experience of "git mergetool" when the command errors out
has been improved.

* pb/mergetool-errors:
  git-difftool--helper.sh: exit upon initialize_merge_tool errors
  git-mergetool--lib.sh: add error message for unknown tool variant
  git-mergetool--lib.sh: add error message if 'setup_user_tool' fails
  git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
  completion: complete '--tool-help' in 'git mergetool'
---

9cd1e2e1a0350a3b6cbc4bcd268f0cbbe8c89687