https://github.com/git/git
Raw File
Tip revision: d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 authored by Junio C Hamano on 13 January 2020, 18:16:43 UTC
Git 2.25
Tip revision: d0654dc
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