From 7962f8dd39adb4445905594312b5b62eca1d9aee Mon Sep 17 00:00:00 2001
From: gfa99 <gfa99@qq.com>
Date: Thu, 10 Aug 2023 16:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=89=88=E6=9C=ACgi?=
 =?UTF-8?q?t(2.34.1)=20/usr/lib/git-core/git-mergetool--lib=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=20'diff=5Fcmd:=20not=20foud'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git-diffall | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git-diffall b/git-diffall
index 3016c49..a31d242 100755
--- a/git-diffall
+++ b/git-diffall
@@ -20,7 +20,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
+# https://github.com/gfa99/git-diffall
 # Perform a directory diff between commits in the repository using
 # the external diff or merge tool specified in the user's config.
 
@@ -261,6 +261,10 @@ then
 	export BASE
 	eval $diff_tool '"$LOCAL"' '"$REMOTE"'
 else
+	type initialize_merge_tool >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		initialize_merge_tool "$merge_tool"
+	fi
 	run_merge_tool "$merge_tool" false
 fi