Philippe Blain <levraiphilippeblain@xxxxxxxxx> writes: > Hi Junio, > > Le 2024-11-22 à 05:11, Junio C Hamano a écrit : > >> >> * 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@xxxxxxxxx> > > I'll send a v2 with some enhancements you suggested, so maybe wait a bit. Thanks, will do.
