about summary refs log blame commit diff
path: root/mergetools/examdiff
blob: e72b06fc4d8ff76e06a0b972ae28df73efd4180d (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16















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

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
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}