HEX
Server: Apache
System: Linux d5818.dxb1.stableserver.net 5.14.0-570.24.1.el9_6.x86_64 #1 SMP PREEMPT_DYNAMIC Tue Jul 1 04:35:16 EDT 2025 x86_64
User: avilonro (1211)
PHP: 8.1.34
Disabled: NONE
Upload Files
File: //usr/libexec/git-core/mergetools/diffuse
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

diff_cmd_help () {
	echo "Use Diffuse (requires a graphical session)"
}

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

merge_cmd_help () {
	echo "Use Diffuse (requires a graphical session)"
}