HEX

Server: nginx/1.22.0

System: Linux iZuf6jdxbygmf6cco977lcZ 5.10.84-10.4.al8.x86_64 #1 SMP Tue Apr 12 12:31:07 CST 2022 x86_64

User: root (0)

PHP: 7.4.29

Disabled: passthru,exec,system,chroot,chgrp,chown,shell_exec,proc_open,proc_get_status,ini_alter,ini_restore,dl,readlink,symlink,popepassthru,stream_socket_server,fsocket,popen

Upload Files

File: //usr/libexec/git-core/mergetools/codecompare

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
			-RF="$MERGED"
	else
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
			-RF="$MERGED"
	fi
}

translate_merge_tool_path() {
	if merge_mode
	then
		echo CodeMerge
	else
		echo CodeCompare
	fi
}