https://github.com/git/git
Raw File
Tip revision: 773e25afc41b1b6533fa9ae2cd825d0b4a697fad authored by Junio C Hamano on 08 February 2021, 22:05:35 UTC
Git 2.30.1
Tip revision: 773e25a
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
}

list_tool_variants () {
	echo bc
	echo bc3
	echo bc4
}
back to top