HEX
Server: Apache
System: Linux scp1.abinfocom.com 5.4.0-216-generic #236-Ubuntu SMP Fri Apr 11 19:53:21 UTC 2025 x86_64
User: confeduphaar (1010)
PHP: 8.1.33
Disabled: exec,passthru,shell_exec,system
Upload Files
File: //proc/self/root/lib/git-core/mergetools/araxis
diff_cmd () {
	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -wait -merge -3 -a1 \
			"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	else
		"$merge_tool_path" -wait -2 \
			"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	fi
}

translate_merge_tool_path() {
	echo compare
}