Skip to main content

Browse the archive

Revision c3ebe91b40c23a1b70dba36383a23016711d8bc0 authored by Junio C Hamano on 31 May 2024, 00:25:37 UTC, committed by Junio C Hamano on 31 May 2024, 00:25:37 UTC 
Sync with Git 2.45.2
2 parent s 58bac47 + bea9ecd
Raw File
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"
}
back to top