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 git-difftool--helper in minimal git #550

Merged
merged 1 commit into from Mar 10, 2024

Conversation

mversluys
Copy link
Contributor

Resolves git-for-windows/git#4806

Verified as working by running the following in sdk

/usr/src/build-extra$ ./mingit/release.sh 0-test

Only mingw64/lib/exec/git-core/mergetools/git-difftool--helper is added to MinGit-0-test-64-bit.zip

Updated make-file-list expressions to allow the script to be included

Signed-off-by: Matthew Versluys <matthew@bonfirestudios.com>
@dscho dscho merged commit 87f535c into git-for-windows:main Mar 10, 2024
12 checks passed
@dscho
Copy link
Member

dscho commented Mar 10, 2024

Thank you!

@dscho
Copy link
Member

dscho commented Mar 10, 2024

/add relnote feature MinGit now supports running git difftool.

The workflow run was started

github-actions bot pushed a commit that referenced this pull request Mar 10, 2024
MinGit [now supports running `git
difftool`](#550).

Signed-off-by: gitforwindowshelper[bot] <gitforwindowshelper-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants