mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 11:26:09 +02:00
Code

Merge 1a715ccbac into e326e52010

This commit is contained in:
Michael Schindler 2024-04-25 23:49:18 +00:00 committed by GitHub
parent e326e52010 1a715ccbac
commit 1f44882efb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool--lib.sh
View File

@ -18,7 +18,7 @@ mode_ok () {
}
is_available () {
merge_tool_path=$(translate_merge_tool_path "$1") &&
merge_tool_path=$(get_merge_tool_path "$1") &&
type "$merge_tool_path" >/dev/null 2>&1
}