I agree. Also in their example they lose a nice property of git - invariance to squashing. If Alice squashes her two changes then the final merge behaves differently to if she hadn't. Very confusing!

Git definitely could be much smart about merge conflicts, but it's a hard research problem so I'm not surprised it isn't.