One Hat Cyber Team

Your IP : 216.73.216.43

Server IP : 162.240.106.28

Server : Linux server.ganesand.com 3.10.0-1160.119.1.el7.x86_64 #1 SMP Tue Jun 4 14:43:51 UTC 2024 x86_64

Server Software : Apache

PHP Version : 7.2.34

Buat File | Buat Folder

Dir : ~/proc/self/root/usr/libexec/git-core/mergetools/

View File Name : diffuse

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
	check_unchanged
}