diff options
Diffstat (limited to 'git-difftool--helper.sh')
| -rwxr-xr-x | git-difftool--helper.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index e6558d1010..3d0fe0cd93 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -73,9 +73,16 @@ then fi fi -# Launch the merge tool on each path provided by 'git diff' -while test $# -gt 6 -do - launch_merge_tool "$1" "$2" "$5" - shift 7 -done +if test -n "$GIT_DIFFTOOL_DIRDIFF" +then + LOCAL="$1" + REMOTE="$2" + run_merge_tool "$merge_tool" false +else + # Launch the merge tool on each path provided by 'git diff' + while test $# -gt 6 + do + launch_merge_tool "$1" "$2" "$5" + shift 7 + done +fi |