I've genuinely had this problem in teams as small as 3 and it's a genuine headache. It's even a problem when you're working solo!

What I want is a comparison with other improved diff/merge drivers like difftastic/mergiraf.