diff options
| author |  Jacob Nisnevich <jacob.nisnevich@gmail.com> | 2016-03-25 16:17:56 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-04 09:15:00 -0700 |
| commit | e36d716751d3477694325e1ff2ece33747133a5b (patch) | |
| tree | 9b1952e82d8743fe6df3130afedc47895a40c7a4 /mergetools | |
| parent | Merge branch 'ls/p4-doc-markup' (diff) | |
| download | tgif-e36d716751d3477694325e1ff2ece33747133a5b.tar.xz | |
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/winmerge | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/mergetools/winmerge b/mergetools/winmerge index 74a66d4e8d..f3819d316a 100644 --- a/mergetools/winmerge +++ b/mergetools/winmerge @@ -13,24 +13,5 @@ merge_cmd () { } translate_merge_tool_path() { - # Use WinMergeU.exe if it exists in $PATH - if type -p WinMergeU.exe >/dev/null 2>&1 - then - printf WinMergeU.exe - return - fi - - # Look for WinMergeU.exe in the typical locations - winmerge_exe="WinMerge/WinMergeU.exe" - for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | - cut -d '=' -f 2- | sort -u) - do - if test -n "$directory" && test -x "$directory/$winmerge_exe" - then - printf '%s' "$directory/$winmerge_exe" - return - fi - done - - printf WinMergeU.exe + mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" } |