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

TortoiseGitMerge.exe old default name #7004

Merged

Conversation

@gerhardol
Copy link
Member

commented Aug 10, 2019

Proposed changes

TortoiseGit changed the name of the Git/Merge executable in v1.8 (2013).
TortoiseMerge.exe -> TortoiseGitMerge.exe

When selecting tmerge as difftool (or TortoiseMerge as mergetool) and clicking Browse, GE searced for the old executable name, changed in 2013.
Using Suggest was OK.

Note: There is still compatibility when selecting Suggest to select tgit <1.8 or TortoiseSVN if no TortoiseGit >=1.8. This could be removed. I added a comment, this could be removed.

Screenshots

Before

image

After

image

Test methodology

Manual


✒️ I contribute this code under The Developer Certificate of Origin.

@gerhardol

This comment has been minimized.

Copy link
Member Author

commented Aug 10, 2019

Tests fail in FormBrowseLeftPanelReorderNodesTest, unrelated

@gerhardol gerhardol force-pushed the gerhardol:bugfix/tortoisegit-suggest-path branch from 7361be5 to 7a609a4 Aug 10, 2019
@RussKie

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

@RussKie RussKie merged commit fafe695 into gitextensions:master Aug 11, 2019
3 checks passed
3 checks passed
CodeFactor No issues found.
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@RussKie RussKie added this to the 3.2.0 milestone Aug 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.