Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
TortoiseGitMerge.exe old default name #7004
TortoiseGit changed the name of the Git/Merge executable in v1.8 (2013).
When selecting tmerge as difftool (or TortoiseMerge as mergetool) and clicking Browse, GE searced for the old executable name, changed in 2013.
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.
these tests seem to have become unstable of late. a build needs to be kicked off again until green…
On Sat, Aug 10, 2019, 2:57 PM Gerhard Olsson ***@***.***> wrote: Tests fail in FormBrowseLeftPanelReorderNodesTest, unrelated — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#7004?email_source=notifications&email_token=ABBTEXX6AMCIMY6BRV7HV43QD2UJRA5CNFSM4IKZHDF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD4AMCXQ#issuecomment-520143198>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABBTEXXKXGKQ6SZRD43L2U3QD2UJRANCNFSM4IKZHDFQ> .