X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mergetools%2Ftkdiff;fp=mergetools%2Ftkdiff;h=618c438e8765a485ffcc70a105fb0cf46010540c;hb=bc7a96a8965d4ce0651689301e1702a942dfb9f0;hp=0000000000000000000000000000000000000000;hpb=240dc3e8edb3ae4ee968febc006fa761811c60e6;p=git.git

diff --git a/mergetools/tkdiff b/mergetools/tkdiff
new file mode 100644
index 000000000..618c438e8
--- /dev/null
+++ b/mergetools/tkdiff
@@ -0,0 +1,12 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
+	else
+		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+	fi
+}