Server : Apache/2.4.62 (Unix) OpenSSL/1.0.2k-fips System : Linux server1.richineiserver.com 3.10.0-1160.119.1.el7.x86_64 #1 SMP Tue Jun 4 14:43:51 UTC 2024 x86_64 User : fdshops ( 1003) PHP Version : 8.2.21 Disable Function : NONE Directory :  /usr/libexec/git-core/mergetools/

Upload File : current_dir [ Writeable ] document_root [ Writeable ]

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

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
	check_unchanged
}