tree e4486ede9a0d92509bb49a6435e7cb126be6bf99
parent fed9391fba44417d6d6559795c0f0194882f12c1
parent 6c22d715e7b4067a6865ff3fbceab991d0042c12
author Junio C Hamano <gitster@pobox.com> 1558251930 +0900
committer Junio C Hamano <gitster@pobox.com> 1558251930 +0900

Merge branch 'dl/difftool-mergetool'

Update "git difftool" and "git mergetool" so that the combinations
of {diff,merge}.{tool,guitool} configuration variables serve as
fallback settings of each other in a sensible order.

* dl/difftool-mergetool:
  difftool: fallback on merge.guitool
  difftool: make --gui, --tool and --extcmd mutually exclusive
  mergetool: fallback to tool when guitool unavailable
  mergetool--lib: create gui_mode function
  mergetool: use get_merge_tool function
  t7610: add mergetool --gui tests
  t7610: unsuppress output