HEX

Warning: set_time_limit() [function.set-time-limit]: Cannot set time limit - prohibited by configuration in /home/u547966/brikov.ru/www/wp-content/plugins/admin-menu-editor/menu-editor.php on line 745
Server: Apache
System: Linux 4.19.0-0.bpo.9-amd64 x86_64 at red40
User: u547966 (5490)
PHP: 5.3.29-mh2
Disabled: syslog, dl, popen, proc_open, proc_nice, proc_get_status, proc_close, proc_terminate, posix_mkfifo, chown, chgrp, accelerator_reset, opcache_reset, accelerator_get_status, opcache_get_status, pcntl_alarm, pcntl_fork, pcntl_waitpid, pcntl_wait, pcntl_wifexited, pcntl_wifstopped, pcntl_wifsignaled, pcntl_wifcontinued, pcntl_wexitstatus, pcntl_wtermsig, pcntl_wstopsig, pcntl_signal, pcntl_signal_dispatch, pcntl_get_last_error, pcntl_strerror, pcntl_sigprocmask, pcntl_sigwaitinfo, pcntl_sigtimedwait, pcntl_exec, pcntl_getpriority, pcntl_setpriority
Upload Files
File: //usr/lib/git-core/mergetools/tortoisemerge
can_diff () {
	return 1
}

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

merge_cmd () {
	if $base_present
	then
		basename="$(basename "$merge_tool_path" .exe)"
		if test "$basename" = "tortoisegitmerge"
		then
			"$merge_tool_path" \
				-base "$BASE" -mine "$LOCAL" \
				-theirs "$REMOTE" -merged "$MERGED"
		else
			"$merge_tool_path" \
				-base:"$BASE" -mine:"$LOCAL" \
				-theirs:"$REMOTE" -merged:"$MERGED"
		fi
	else
		echo "$merge_tool_path cannot be used without a base" 1>&2
		return 1
	fi
}

translate_merge_tool_path() {
	if type tortoisegitmerge >/dev/null 2>/dev/null
	then
		echo tortoisegitmerge
	else
		echo tortoisemerge
	fi
}

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