diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-01 14:02:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-01 14:02:30 -0700 |
| commit | a225a2601014bf06ddba932c9dab6cc299ab5239 (patch) | |
| tree | b74f4243740b0e197707e3eacf161e111cad5513 | |
| parent | Sync with maint (diff) | |
| parent | mergetool-lib: fix default tool selection (diff) | |
| download | git-a225a2601014bf06ddba932c9dab6cc299ab5239.tar.gz git-a225a2601014bf06ddba932c9dab6cc299ab5239.zip | |
Merge branch 'da/mergetool-winmerge'
Hotfix for an earlier change already in 'master' that broke the
default tool selection for mergetool.
* da/mergetool-winmerge:
mergetool-lib: fix default tool selection
| -rw-r--r-- | git-mergetool--lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 14b039de65..54ac8e4846 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -305,6 +305,7 @@ guess_merge_tool () { EOF # Loop over each candidate and stop when a valid merge tool is found. + IFS=' ' for tool in $tools do is_available "$tool" && echo "$tool" && return 0 |