HEX
Server: Apache
System: Linux vps28526 6.8.0-79-generic #79~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Fri Aug 15 16:54:53 UTC 2 x86_64
User: heewonvps_17 (6705002)
PHP: 7.4.33
Disabled: NONE
Upload Files
File: //lib/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
}