MOON
Server: Apache
System: Linux vmi1129355.contaboserver.net 3.10.0-1160.118.1.el7.x86_64 #1 SMP Wed Apr 24 16:01:50 UTC 2024 x86_64
User: trebiaseguros (1001)
PHP: 8.3.8
Disabled: exec,passthru,shell_exec,system
Upload Files
File: //usr/libexec/git-core/mergetools/ecmerge
diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	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
	check_unchanged
}