Moving to Git, looking for a good XML diff tool

[btodd]

We are moving from SVN to Git, and I'm in search of a good XML diff tool. Has anyone had a good experience with a diff tool that specializes in XML?

A little history:
We've always used SVN and experienced pain with various free diff tools (think diff tool in TortoiseSVN, etc.) "breaking" some of Flare's XML markup. We have not been using Flare's native SVN control.

Since we've been playing with Git, I've tried to set up some tools to interact with Sourcetree with limited success (Sourcetree on Windows is a bit clunky feeling). At this point, I've decided that I like the command line better than the Windows GUI for Sourcetree, especially since I can't get it to work with a diff tool very well. I have tried some standard tools for command line work, but they are still breaking some things the way my previous set of tools did.

[Psider]

Have you tried Beyond Compare by Scooter Software? I don't do any merging (I assume that's where the 'breaking' occurs?), but you can define your own grammar rules, so perhaps this could be tweaked to suit your needs.

http://www.scootersoftware.com/index.php

[svt-user]

DiffMerge is popular here.

However, as soon as I dumped some big binary blobs into the git repo, they threw me out and gave me my own VM to run SVN.