tree 211341a0242982559a10cad7bb2f3fcfbe111477
parent 05fb8726cccc74908853c166248ff9b6abdafae5
author Denton Liu <liu.denton@gmail.com> 1556518871 -0400
committer Junio C Hamano <gitster@pobox.com> 1557756719 +0900

mergetool--lib: create gui_mode function

Before, in `get_configured_merge_tool`, we would test the value of the
first argument directly, which corresponded to whether we were using
guitool. However, since `$GIT_MERGETOOL_GUI` is available as an
environment variable, create the `gui_mode` function which increases the
clarify of functions which use it.

While we're at it, add a space before `()` in function definitions to
fix the style.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>