Subject: [PATCH] mergetool: add win32 path translation for diffmerge

From: "Bert Huijben via GitGitGadget" <[email-masked]>
Date: Thu, 29 Apr 2021 11:39:58 +0000

From: Bert Huijben <[email-masked]>

Use the infrastructure added for finding winmerge to also
automatically find DiffMerge,

Signed-off-by: Bert Huijben <[email-masked]>
---
    mergetool: Add win32 path translation for DiffMerge
    
    Re-use the path translation added for winmerge to automatically find
    SouceGear DiffMerge on Windows.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1014%2Frhuijben%2Ffix%2Fdiffmerge-path-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1014/rhuijben/fix/diffmerge-path-v1
Pull-Request: https://github.com/git/git/pull/1014

 mergetools/diffmerge | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 9b6355b98a71..458ed9a89718 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -16,3 +16,7 @@ merge_cmd () {
 exit_code_trustable () {
 	true
 }
+
+translate_merge_tool_path() {
+	mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"
+}

base-commit: b0c09ab8796fb736efa432b8e817334f3e5ee75a
-- 
gitgitgadget