[thirdparty/git.git] / mergetools / defaults

# Redefined by builtin tools
can_merge () {
	return 0
}

can_diff () {
	return 0
}

diff_cmd () {
	status=1
	return $status
}

merge_cmd () {
	status=1
	return $status
}

translate_merge_tool_path () {
	echo "$1"
}
Commit	Line	Data
bc7a96a8 DA	1	# Redefined by builtin tools
	2	can_merge () {
	3	return 0
	4	}
	5
	6	can_diff () {
	7	return 0
	8	}
	9
	10	diff_cmd () {
a427ef7a	11	status=1
bc7a96a8 DA	12	return $status
	13	}
	14
	15	merge_cmd () {
a427ef7a	16	status=1
bc7a96a8 DA	17	return $status
	18	}
	19
	20	translate_merge_tool_path () {
	21	echo "$1"
	22	}