Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 454cb6bd52a4de614a3633e4f547af03d5c3b640 authored by Junio C Hamano on 29 November 2016, 20:23:07 UTC
Git 2.11
Tip revision: 454cb6b
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.
	touch "$BACKUP"
	"$merge_tool_path" -u -e -dl Local -dr Remote \
		"$LOCAL" "$REMOTE" "$MERGED"
	check_unchanged
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}
back to top