#!/bin/sh
+# Thanks to Thomas Rast
+# http://thread.gmane.org/gmane.comp.version-control.git/124807
+SUBDIRECTORY_OK=1
. "$(git --exec-path)/git-sh-setup"
cd_to_toplevel # for the tar below
cd "$tmp"
#meld a b
#diff -ur a b
-kdiff3 a b
+tool="$(git-config diff.tool)"
+if [ -n "$tool" ]; then
+ "$tool" a b
+else
+ diff -urN a b
+fi