3 ms·
Does anyone here know of a good 3-way merge tool for Git that's available on OSX?
by edanm 14y ago
Does anyone here know of a good 3-way merge tool for Git that's available on OSX?
- Aga 14y agoKDiff3 has worked nice for me and it seems to be availabe for OS X too: http://kdiff3.sourceforge.net/ http://kdiff3.sourceforge.net/ (however I have not tested it on an OS X)