diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-04-29 02:21:11 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:11:59 +0900 |
| commit | 884630b2e2634969656faabc7f4e33cab2e32b35 (patch) | |
| tree | 211341a0242982559a10cad7bb2f3fcfbe111477 /tmp-objdir.c | |
| parent | mergetool: use get_merge_tool function (diff) | |
| download | tgif-884630b2e2634969656faabc7f4e33cab2e32b35.tar.xz | |
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>
Diffstat (limited to 'tmp-objdir.c')
0 files changed, 0 insertions, 0 deletions