ok

Mini Shell

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

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

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

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

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

Zerion Mini Shell 1.0