From: Johannes Sixt <j6t@kdbg.org>
Date: Sat, 9 Nov 2024 13:34:50 +0000 (+0100)
Subject: Merge branch 'tb/mergetool-from-config'
X-Git-Tag: v2.48.0-rc0~66^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=492550155aec3113a4d3d2232c3f259f83737478;p=thirdparty%2Fgit.git

Merge branch 'tb/mergetool-from-config'

* tb/mergetool-from-config:
  git gui: add directly calling merge tool from configuration
---

492550155aec3113a4d3d2232c3f259f83737478