2 ms·Mergiraf – a merge driver for Git that can solve a wide range of merge conflicts2 points by sandebert 2y ago