ok

Mini Shell

Direktori : /proc/self/root/proc/self/root/usr/libexec/git-core/mergetools/
Upload File :
Current File : //proc/self/root/proc/self/root/usr/libexec/git-core/mergetools/opendiff

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

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

Zerion Mini Shell 1.0