2 ms·How to use kdiff3 as a 3-way merge tool with mercurial, git, and Tower.app1 points by tednaleid 15y ago