Re: What's cooking in git.git (Nov 2024, #08; Fri, 22)

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Nov 22, 2024, 19:10 UTC
Message-ID: <558f7192-6dd6-8434-c07a-921e2e55754a@gmail.com>
In-Reply-To: <xmqqy11bshme.fsf@gitster.g>

Hi Junio,

Le 2024-11-22 à 05:11, Junio C Hamano a écrit :

Show 13 quoted lines

> 
> * pb/mergetool-errors (2024-11-13) 5 commits
>  - 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 in 'setup_user_tool'
>  - git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
>  - completion: complete '--tool-help' in 'git mergetool'
> 
>  End-user experience of "git mergetool" when the command errors out
>  has been improved.
> 
>  Will merge to 'next'?
>  source: <pull.1827.git.1731459128.gitgitgadget@gmail.com>

I'll send a v2 with some enhancements you suggested, so maybe wait a bit.

Thanks, Philippe.