XylotrechusZ

XylotrechusZ Shell

: /usr/libexec/git-core/mergetools/ [ drwxr-xr-x ]
Uname: Linux premium294.web-hosting.com 4.18.0-553.45.1.lve.el8.x86_64 #1 SMP Wed Mar 26 12:08:09 UTC 2025 x86_64
Software: LiteSpeed
PHP version: 8.1.32 [ PHP INFO ] PHP os: Linux
Server Ip: 104.21.112.1
Your Ip: 216.73.216.223
User: mjbynoyq (1574) | Group: mjbynoyq (1570)
Safe Mode: OFF
Disable Function:
NONE

name : 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)"
}
© 2025 XylotrechusZ