BLACKSITE


	: 216.73.216.163
	: 103.21.58.60 / hariomequipments.com
	: Linux bh-in-4.webhostbox.net 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/tkdiff

 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
}