GhostManSec
Server: Apache
System: Linux 57.167.178.68.host.secureserver.net 3.10.0-1160.118.1.el7.x86_64 #1 SMP Wed Apr 24 16:01:50 UTC 2024 x86_64
User: countrycraft1 (1001)
PHP: 7.4.33
Disabled: exec,passthru,shell_exec,system
Upload Files
File: //usr/libexec/git-core/mergetools/codecompare
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

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