HEX
Server: LiteSpeed
System: Linux spg20.cloudpowerdns.com 5.14.0-611.35.1.el9_7.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Feb 25 03:46:09 EST 2026 x86_64
User: carrerup (3153)
PHP: 8.2.30
Disabled: NONE
Upload Files
File: //proc/thread-self/root/usr/libexec/git-core/mergetools/ecmerge
diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
}

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