https://github.com/git/git
Raw File
Tip revision: d95553a6b8c5153f541adcfc3346004e8249b0e6 authored by Junio C Hamano on 03 April 2016, 17:11:35 UTC
Git 2.8.1
Tip revision: d95553a
bc
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

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