tortoisemerge 638 Bytes
Newer Older
1 2 3 4 5 6 7 8
can_diff () {
	return 1
}

merge_cmd () {
	if $base_present
	then
		touch "$BACKUP"
9 10 11 12 13 14 15 16 17 18 19
		basename="$(basename "$merge_tool_path" .exe)"
		if test "$basename" = "tortoisegitmerge"
		then
			"$merge_tool_path" \
				-base "$BASE" -mine "$LOCAL" \
				-theirs "$REMOTE" -merged "$MERGED"
		else
			"$merge_tool_path" \
				-base:"$BASE" -mine:"$LOCAL" \
				-theirs:"$REMOTE" -merged:"$MERGED"
		fi
20 21
		check_unchanged
	else
22
		echo "$merge_tool_path cannot be used without a base" 1>&2
23 24 25
		return 1
	fi
}
26 27 28 29 30 31 32 33 34

translate_merge_tool_path() {
	if type tortoisegitmerge >/dev/null 2>/dev/null
	then
		echo tortoisegitmerge
	else
		echo tortoisemerge
	fi
}