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

diff --git a/mergetools/defaults b/mergetools/defaults
new file mode 100644
index 000000000..1d8f2a3dd
--- /dev/null
+++ b/mergetools/defaults
@@ -0,0 +1,46 @@
+# Redefined by builtin tools
+can_merge () {
+	return 0
+}
+
+can_diff () {
+	return 0
+}
+
+diff_cmd () {
+	merge_tool_cmd="$(get_merge_tool_cmd "$1")"
+	if test -z "$merge_tool_cmd"
+	then
+		status=1
+		break
+	fi
+	( eval $merge_tool_cmd )
+	status=$?
+	return $status
+}
+
+merge_cmd () {
+	merge_tool_cmd="$(get_merge_tool_cmd "$1")"
+	if test -z "$merge_tool_cmd"
+	then
+		status=1
+		break
+	fi
+	trust_exit_code="$(git config --bool \
+		mergetool."$1".trustExitCode || echo false)"
+	if test "$trust_exit_code" = "false"
+	then
+		touch "$BACKUP"
+		( eval $merge_tool_cmd )
+		status=$?
+		check_unchanged
+	else
+		( eval $merge_tool_cmd )
+		status=$?
+	fi
+	return $status
+}
+
+translate_merge_tool_path () {
+	echo "$1"
+}