Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 08f9c32463bf9e578acb7ac5f77afd36e803c6bc authored by Junio C Hamano on 12 July 2017, 22:24:15 UTC
Git 2.13.3
Tip revision: 08f9c32
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