[thirdparty/git.git] / mergetools / codecompare

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use Code Compare (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
			-RF="$MERGED"
	else
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
			-RF="$MERGED"
	fi
}

merge_cmd_help () {
	echo "Use Code Compare (requires a graphical session)"
}

translate_merge_tool_path() {
	if merge_mode
	then
		echo CodeMerge
	else
		echo CodeCompare
	fi
}
Commit	Line	Data
755e8b3f SS	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE"
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use Code Compare (requires a graphical session)"
	7	}
	8
755e8b3f	9	merge_cmd () {
755e8b3f SS	10	if $base_present
	11	then
	12	"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
	13	-RF="$MERGED"
	14	else
	15	"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
	16	-RF="$MERGED"
	17	fi
755e8b3f SS	18	}
755e8b3f SS	19
980145f7 FR	20	merge_cmd_help () {
	21	echo "Use Code Compare (requires a graphical session)"
	22	}
	23
755e8b3f SS	24	translate_merge_tool_path() {
	25	if merge_mode
	26	then
	27	echo CodeMerge
	28	else
	29	echo CodeCompare
	30	fi
	31	}