Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: c522f061d551c9bb8684a7c3859b2ece4499b56b authored by Junio C Hamano on 17 February 2020, 04:37:38 UTC
Git 2.25.1
Tip revision: c522f06
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"
}
back to top