Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 0822e66b5d49d0de1aa767b38785e42de05eaf40 authored by Junio C Hamano on 17 March 2020, 21:54:02 UTC
Git 2.25.2
Tip revision: 0822e66
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