"Bert Huijben via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> From: Bert Huijben <bert@xxxxxxxx>
>
> Use the infrastructure added for finding winmerge to also
> automatically find DiffMerge,
> ...
> 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"
> +}
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?
