From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Nov 2024 03:47:44 +0000 (+0900)
Subject: Merge https://github.com/j6t/git-gui
X-Git-Tag: v2.48.0-rc0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b31fb630c0fc6869a33ed717163e8a1210460d94;p=thirdparty%2Fgit.git

Merge https://github.com/j6t/git-gui

* https://github.com/j6t/git-gui:
  git gui: add directly calling merge tool from configuration
  git-gui: strip commit messages less aggressively
  git-gui: strip comments and consecutive empty lines from commit messages
---

b31fb630c0fc6869a33ed717163e8a1210460d94