diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-07-08 20:15:04 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 20:15:04 (GMT) |
commit | b7bd70ddd4d38b16a1af6975df8077306ee998da (patch) | |
tree | 070e538c7e1a6c9e750a96b66eb293678309c03c | |
parent | e867110340c236d2ba977d2c4bf1274a297f4e21 (diff) | |
parent | 47eb4c689073eddc082007255564e1d3e142b727 (diff) | |
download | git-b7bd70ddd4d38b16a1af6975df8077306ee998da.zip git-b7bd70ddd4d38b16a1af6975df8077306ee998da.tar.gz git-b7bd70ddd4d38b16a1af6975df8077306ee998da.tar.bz2 |
Merge branch 'ms/mergetools-kdiff3-on-windows'
On Windows, mergetool has been taught to find kdiff3.exe just like
it finds winmerge.exe.
* ms/mergetools-kdiff3-on-windows:
mergetools/kdiff3: make kdiff3 work on Windows too
-rw-r--r-- | mergetools/kdiff3 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 0264ed5..520cb91 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -25,3 +25,12 @@ merge_cmd () { exit_code_trustable () { true } + +translate_merge_tool_path() { + if type kdiff3 >/dev/null 2>/dev/null + then + echo kdiff3 + else + mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" + fi +} |