Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 3b827444811d7eddeddd44850f5dbbb4d59747f5 authored by Junio C Hamano on 30 July 2017, 22:02:37 UTC
Git 2.11.3
Tip revision: 3b82744
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