mergetool: add win32 path translation for diffmerge
PATCH 1/1 mergetool: add win32 path translation for diffmerge
From: Bert Huijben <[email protected]>
Use the infrastructure added for finding winmerge to also automatically find DiffMerge,
---
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(+)
mergetools/diffmerge +4 -0
@@ -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
Signature · 1 line
gitgitgadget
Quoted 10 lines · Bert Huijben via GitGitGadget
From: Bert Huijben <[email protected]>
Use the infrastructure added for finding winmerge to also automatically find DiffMerge,
...mergetools/diffmerge +0
-0
mergetools/diffmerge merge_cmd () { · line 22
Quoted 7 lines
mergetools/diffmerge +4
-0@@ -16,3 +16,7 @@ merge_cmd () { exit_code_trustable () { true } + +translate_merge_tool_path() { + mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge" +}
c5f424fd (mergetools/diffmerge: support DiffMerge as a git mergetool, 2013-10-13) explains that
mergetools/diffmerge: support DiffMerge as a git mergetool
DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.
See http://www.sourcegear.com/diffmerge/
DiffMerge includes a script /usr/bin/diffmerge that can be used to launch the graphical compare tool.
Now, I would assume sgdm.exe would be something users of Windows version of the tool may be familiar with, but how would the proposed change affect users of the tool on other platforms?