X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-difftool--helper.sh;h=0594bf7ca54c6b91d5f96dd86d8962e93459d004;hb=625589b5bebb95a13732c15b7c680c8b1540035b;hp=524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2;hpb=b7d0da858bb2f22c6ef3dbb20c1ded0302f4eaca;p=thirdparty%2Fgit.git diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 524f5ea8ab..0594bf7ca5 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"