[thirdparty/git.git] / mergetools / winmerge

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.
	"$merge_tool_path" -u -e -dl Local -dr Remote \
		"$LOCAL" "$REMOTE" "$MERGED"
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}
Commit	Line	Data
3e4f2373 DA	1	diff_cmd () {
	2	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
	3	return 0
	4	}
	5
	6	merge_cmd () {
	7	# mergetool.winmerge.trustExitCode is implicitly false.
	8	# touch $BACKUP so that we can check_unchanged.
3e4f2373 DA	9	"$merge_tool_path" -u -e -dl Local -dr Remote \
3e4f2373 DA	10	"$LOCAL" "$REMOTE" "$MERGED"
3e4f2373 DA	11	}
	12
	13	translate_merge_tool_path() {
e36d7167	14	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
3e4f2373	15	}