about summary refs log tree commit diff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/tkdiff')
-rw-r--r--mergetools/tkdiff16
1 files changed, 16 insertions, 0 deletions
diff --git a/mergetools/tkdiff b/mergetools/tkdiff
new file mode 100644
index 000000000000..eee5cb57e3cc
--- /dev/null
+++ b/mergetools/tkdiff
@@ -0,0 +1,16 @@
+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
+}
+
+exit_code_trustable () {
+	true
+}