[thirdparty/git.git] / mergetools / 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
}
Commit	Line	Data
f13f9b0e JH	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE"
	3	}
	4
	5	merge_cmd () {
f13f9b0e JH	6	if $base_present
	7	then
	8	"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
	9	-mergeoutput="$MERGED"
	10	else
	11	"$merge_tool_path" "$LOCAL" "$REMOTE" \
	12	-mergeoutput="$MERGED"
	13	fi
f13f9b0e JH	14	}
	15
	16	translate_merge_tool_path() {
	17	if type bcomp >/dev/null 2>/dev/null
	18	then
	19	echo bcomp
	20	else
	21	echo bcompare
	22	fi
	23	}
83bbf9b9	24
	25	list_tool_variants () {
	26	echo bc
	27	echo bc3
6bc9082c	28	echo bc4
83bbf9b9	29	}