Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: e0c1ceafc5bece92d35773a75fff59497e1d9bd5 authored by Junio C Hamano on 12 August 2016, 16:17:51 UTC
Git 2.9.3
Tip revision: e0c1cea
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