[thirdparty/git.git] / mergetools / examdiff

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

diff_cmd_help () {
	echo "Use ExamDiff Pro (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
	else
		"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
	fi
}

merge_cmd_help () {
	echo "Use ExamDiff Pro (requires a graphical session)"
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}
Commit	Line	Data
35d62bbe JN	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use ExamDiff Pro (requires a graphical session)"
	7	}
	8
35d62bbe	9	merge_cmd () {
35d62bbe JN	10	if $base_present
	11	then
	12	"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
	13	else
	14	"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
	15	fi
35d62bbe JN	16	}
35d62bbe JN	17
980145f7 FR	18	merge_cmd_help () {
	19	echo "Use ExamDiff Pro (requires a graphical session)"
	20	}
	21
35d62bbe JN	22	translate_merge_tool_path() {
	23	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
	24	}