HEX
Server: LiteSpeed
System: Linux s3604.bom1.stableserver.net 4.18.0-513.11.1.lve.el8.x86_64 #1 SMP Thu Jan 18 16:21:02 UTC 2024 x86_64
User: dmstechonline (1480)
PHP: 7.4.33
Disabled: NONE
Upload Files
File: //proc/3233645/root/usr/libexec/git-core/mergetools/diffmerge
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
}

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

exit_code_trustable () {
	true
}