https://github.com/git/git
Raw File
Tip revision: 6eed462c8f973719799691c4f51b97f7970f2ac4 authored by Johannes Schindelin on 12 February 2021, 14:47:43 UTC
Git 2.18.5
Tip revision: 6eed462
bc
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
			-mergeoutput="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-mergeoutput="$MERGED"
	fi
}

translate_merge_tool_path() {
	if type bcomp >/dev/null 2>/dev/null
	then
		echo bcomp
	else
		echo bcompare
	fi
}
back to top