[thirdparty/git.git] / mergetools / tortoisemerge

can_diff () {
	return 1
}

merge_cmd () {
	if $base_present
	then
		touch "$BACKUP"
		"$merge_tool_path" \
			-base:"$BASE" -mine:"$LOCAL" \
			-theirs:"$REMOTE" -merged:"$MERGED"
		check_unchanged
	else
		echo "TortoiseMerge cannot be used without a base" 1>&2
		return 1
	fi
}
Commit	Line	Data
bc7a96a8 DA	1	can_diff () {
	2	return 1
	3	}
	4
	5	merge_cmd () {
	6	if $base_present
	7	then
	8	touch "$BACKUP"
	9	"$merge_tool_path" \
	10	-base:"$BASE" -mine:"$LOCAL" \
	11	-theirs:"$REMOTE" -merged:"$MERGED"
	12	check_unchanged
	13	else
	14	echo "TortoiseMerge cannot be used without a base" 1>&2
	15	return 1
	16	fi
	17	}