Shadow-Here
Server : Apache
System : Linux methusalix2 3.16.0-11-amd64 #1 SMP Debian 3.16.84-1 (2020-06-09) x86_64
User : hios ( 1437)
PHP Version : 5.6.40-0+deb8u12
Disable Function : proc_close,proc_open,dl,shell_exec,passthru
Directory :  /usr/lib/git-core/mergetools/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

Command :
Current File : //usr/lib/git-core/mergetools/kdiff3
diff_cmd () {
	"$merge_tool_path" \
		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
		"$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Base)" \
			--L2 "$MERGED (Local)" \
			--L3 "$MERGED (Remote)" \
			-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	else
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Local)" \
			--L2 "$MERGED (Remote)" \
			-o "$MERGED" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	fi
	status=$?
}

Samx