summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
blob: f3819d316a2c05d9fe1f850d6ac20b04d9df0417 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff_cmd () {
	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
	return 0
}

merge_cmd () {
	# mergetool.winmerge.trustExitCode is implicitly false.
	# touch $BACKUP so that we can check_unchanged.
	touch "$BACKUP"
	"$merge_tool_path" -u -e -dl Local -dr Remote \
		"$LOCAL" "$REMOTE" "$MERGED"
	check_unchanged
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}