HEX
Server: Apache/2
System: Linux nexus-01 4.18.0-553.120.1.el8_10.x86_64 #1 SMP Mon Apr 20 18:04:27 EDT 2026 x86_64
User: aglcoke (1118)
PHP: 8.2.31
Disabled: mail,exec,system,passthru,shell_exec,proc_close,proc_open,dl,popen,show_source,posix_kill,posix_mkfifo,posix_getpwuid,posix_setpgid,posix_setsid,posix_setuid,posix_setgid,posix_seteuid,posix_setegid,posix_uname
Upload Files
File: //usr/libexec/git-core/mergetools/examdiff
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
	else
		"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
	fi
}

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

translate_merge_tool_path() {
	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}