From: Denton Liu <liu.denton@gmail.com>
Date: Mon, 29 Apr 2019 06:21:11 +0000 (-0400)
Subject: mergetool--lib: create gui_mode function
X-Git-Tag: v2.22.0-rc1~21^2~3
X-Git-Url: https://git.uis.cam.ac.uk/x/uis/git/git.git/commitdiff_plain/884630b2e2634969656faabc7f4e33cab2e32b35?hp=884630b2e2634969656faabc7f4e33cab2e32b35

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>
---