Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include diff.exe into the installers #61

Merged
merged 1 commit into from
May 28, 2015
Merged

Include diff.exe into the installers #61

merged 1 commit into from
May 28, 2015

Conversation

dscho
Copy link
Member

@dscho dscho commented May 28, 2015

It is required by git mergetool.

This fixes git-for-windows/git#163

Signed-off-by: Johannes Schindelin johannes.schindelin@gmx.de

It is required by `git mergetool`.

This fixes git-for-windows/git#163

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented May 28, 2015

Oh well, I thought about it and it is obvious enough that this is an improvement.

dscho added a commit that referenced this pull request May 28, 2015
Include `diff.exe` into the installers
@dscho dscho merged commit b1a44e6 into master May 28, 2015
@dscho dscho deleted the diff branch May 28, 2015 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

git mergetool: line 291: diff: command not found
1 participant