]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bba503d) | patch
git-mergetool--lib.sh: add error message for unknown tool variant
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Fri, 22 Nov 2024 19:50:21 +0000 (19:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Nov 2024 02:59:19 +0000 (11:59 +0900)
commitacca46d12464cc64b623b104c04977d8db1a9591
tree14968a133f9262b51d62f9b62f5cf5ab917bfa81tree | snapshot
parentbba503d43ef43a90597795e5e82018ba33d6a095commit | diff
git-mergetool--lib.sh: add error message for unknown tool variant

In setup_tool, we check if the given tool is a known variant of a tool,
and quietly return with an error if not. This leads to the following
invocation quietly failing:

git mergetool --tool=vimdiff4

Add an error message before returning in this case.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool--lib.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.