> It's merging workflow is awful - I'm fine with correcting the odd whitespace-as-conflict, but I find the fact that git presents me with >>>>> eyebiting ====== conflict markers <<<<<< even when I'm using a merge tool difficult to excuse.

You might want to customize merge.conflictstyle

I do like the default of git however, and prefer it to, say, Mercurial.