From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Apr 2023 01:05:11 +0000 (-0700)
Subject: Merge branch 'tk/mergetool-gui-default-config'
X-Git-Tag: v2.41.0-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d8370d44547d69e0734e47bb1c38e7ccd3e5387;p=thirdparty%2Fgit.git

Merge branch 'tk/mergetool-gui-default-config'

"git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.

* tk/mergetool-gui-default-config:
  mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
---

9d8370d44547d69e0734e47bb1c38e7ccd3e5387