2

By chosing File -> Preferences -> Git Config -> Diff tool / Merge tool you can adjust your favourite diff/merge tool when using Tower for GIT (https://www.git-tower.com/)

DiffMerge and WinMerge are installed on my Windows machine, but only WinMerge is offered in my case.

On https://www.git-tower.com/help/mac/integration/diff-tools you can read that DiffMerge should be supported, but it is obviously not. What in my setup is missing?

On https://www.git-tower.com/help/mac/integration/custom-diff-tools it is described what you can do if your diff/merge tool is not directly supported by Tower. But DiffMerge should be supported. If it is not supported how would this integration script look like for DiffMerge?

Thank you in advance!

Improve this question
1
  • Looks like you can set up a custom tool on git-tower, but also notice that WinMerge doesn't really support three-way merge. It's only good for diffs. (They'd said so explicitly on the old WinMerge support site, but that's apparently gone now.) Commented Apr 20, 2022 at 16:54
Related questions
8
Problem with git + DiffMerge on OS X
2
git gui using diff -b as difftool
2
git with DiffMerge setup to mimic Mercurials setup with diffmerge
Load 7 more related questions Show fewer related questions

0

Reset to default

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.