summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJacob Nisnevich <jacob.nisnevich@gmail.com>2016-03-25 23:17:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-04 16:15:00 (GMT)
commite36d716751d3477694325e1ff2ece33747133a5b (patch)
tree9b1952e82d8743fe6df3130afedc47895a40c7a4 /mergetools
parent56331f8727b0c2e7dc713b728eaf1e5843422cb7 (diff)
downloadgit-e36d716751d3477694325e1ff2ece33747133a5b.zip
git-e36d716751d3477694325e1ff2ece33747133a5b.tar.gz
git-e36d716751d3477694325e1ff2ece33747133a5b.tar.bz2
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/winmerge21
1 files changed, 1 insertions, 20 deletions
diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74a66d4..f3819d3 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"
}