HEX
Server: Apache
System: FreeBSD www860.sakura.ne.jp 13.0-RELEASE-p14 FreeBSD 13.0-RELEASE-p14 #2: Mon Dec 9 13:54:55 JST 2024 root@www5301.sakura.ne.jp:/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64
User: yoyo0427 (1306)
PHP: 8.3.8
Disabled: NONE
Upload Files
File: //usr/local/libexec/git-core/mergetools/guiffy
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -s "$LOCAL" \
		"$REMOTE" "$BASE" "$MERGED"
	else
		"$merge_tool_path" -m "$LOCAL" \
		"$REMOTE" "$MERGED"
	fi
}

exit_code_trustable () {
	true
}