%PDF- %PDF-
Mini Shell

Mini Shell

Direktori : /var/www/pjc/public/1337_DATA/alfasymlink/root/usr/lib/git-core/mergetools/
Upload File :
Create Path :
Current File : /var/www/pjc/public/1337_DATA/alfasymlink/root/usr/lib/git-core/mergetools/opendiff

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
}

Zerion Mini Shell 1.0