Spade

Mini Shell

Directory:~$ /usr/libexec/git-core/mergetools/
Upload File
[Home] [System Details] [Kill Me]
Current File:~$ //usr/libexec/git-core/mergetools/tkdiff

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED"
"$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL"
"$REMOTE"
	fi
}