HEX
Server: LiteSpeed
System: Linux neo.webimonline.com 5.14.0-687.12.1.el9_8.x86_64 #1 SMP PREEMPT_DYNAMIC Sun Jun 7 14:39:27 EDT 2026 x86_64
User: smarimaki (1290)
PHP: 7.4.33
Disabled: mail
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)"
}