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

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
new file mode 100644
index 000000000..ed7db495e
--- /dev/null
+++ b/mergetools/tortoisemerge
@@ -0,0 +1,17 @@
+can_diff () {
+	return 1
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		touch "$BACKUP"
+		"$merge_tool_path" \
+			-base:"$BASE" -mine:"$LOCAL" \
+			-theirs:"$REMOTE" -merged:"$MERGED"
+		check_unchanged
+	else
+		echo "TortoiseMerge cannot be used without a base" 1>&2
+		return 1
+	fi
+}