BLACKSITE


	: 216.73.217.141
	: 119.18.54.19 / yugtechnologies.com
	: Linux sh200.bigrock.com 4.19.286-203.ELK.el7.x86_64 #1 SMP Wed Jun 14 04:33:55 CDT 2023 x86_64

: /usr/libexec/git-core/mergetools/

files >> //usr/libexec/git-core/mergetools/tortoisemerge

 can_diff () {
	return 1
}

merge_cmd () {
	if $base_present
	then
		touch "$BACKUP"
		basename="$(basename "$merge_tool_path" .exe)"
		if test "$basename" = "tortoisegitmerge"
		then
			"$merge_tool_path" \
				-base "$BASE" -mine "$LOCAL" \
				-theirs "$REMOTE" -merged "$MERGED"
		else
			"$merge_tool_path" \
				-base:"$BASE" -mine:"$LOCAL" \
				-theirs:"$REMOTE" -merged:"$MERGED"
		fi
		check_unchanged
	else
		echo "$merge_tool_path cannot be used without a base" 1>&2
		return 1
	fi
}

translate_merge_tool_path() {
	if type tortoisegitmerge >/dev/null 2>/dev/null
	then
		echo tortoisegitmerge
	else
		echo tortoisemerge
	fi
}