Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fast-import: don't fail on omitted committer name
[gitweb.git]
/
git-difftool--helper.sh
diff --git
a/git-difftool--helper.sh
b/git-difftool--helper.sh
index 524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2..0594bf7ca54c6b91d5f96dd86d8962e93459d004 100755
(executable)
--- 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"