Skip to main content
Share Your Experience: Take the 2024 Developer Survey
1 vote

GUI git mergetool for Mac/OSX with dark mode, 3 panels, and allows editing local/remote?

Beyond Compare 4 has color schemes you can import or change, at least for the text (no idea if one can change the color of the toolbar/menu bar, for example. Visual Studio has a tool vsdiffmerge that ...
kutschkem's user avatar
  • 462
1 vote

Git conflict resolution tool that respects conflict annotations

kdiff3 can handle this. It is a generic diff viewer and merge tool (you can use also outside of any VCS, for example to compare directories content). If using git you can have this in your gitconfig: ...
Patrick Mevzek's user avatar
1 vote

3-way merge tool for C#/SQL/Javascript development on Windows - BeyondCompare or Kdiff3 or?

You can try WinMerge, an open source differencing and merging tool for Windows. Its recent version supports 3-way File Comparison.
kenorb's user avatar
  • 3,133

Only top scored, non community-wiki answers of a minimum length are eligible