X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-difftool--helper.sh;h=0594bf7ca54c6b91d5f96dd86d8962e93459d004;hb=fea6128baec24fcfe9433a34a06bd9d6e6298bab;hp=524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2;hpb=f3604763ba0355f628cf815cfaf4fec20d46e958;p=git.git diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 524f5ea8a..0594bf7ca 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -49,6 +49,7 @@ launch_merge_tool () { fi if use_ext_cmd; then + export BASE eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' else run_merge_tool "$merge_tool"