summaryrefslogtreecommitdiff
path: root/mergetools/defaults
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/defaults')
-rw-r--r--mergetools/defaults22
1 files changed, 22 insertions, 0 deletions
diff --git a/mergetools/defaults b/mergetools/defaults
new file mode 100644
index 0000000000..21e63ecc3e
--- /dev/null
+++ b/mergetools/defaults
@@ -0,0 +1,22 @@
+# Redefined by builtin tools
+can_merge () {
+ return 0
+}
+
+can_diff () {
+ return 0
+}
+
+diff_cmd () {
+ status=1
+ return $status
+}
+
+merge_cmd () {
+ status=1
+ return $status
+}
+
+translate_merge_tool_path () {
+ echo "$1"
+}