@Clark, just use BC for a while. You'll see what we mean. Once you've used BC to merge a conflict consisting of interleaving changes to a single function, you'll wonder how you lived without it.
As noted, you can align individual lines in the compare, which can really help isolate the real changes from the resync noise that every diff tool I've used suffers. At least with BC, you can help the tool get unconfused.
This is no criticism, just an observation: You appear to prefer to live in a text/CLI world, and I haven't observed much appreciation of eye candy, so maybe what we like about BC won't be as valuable to you.
It's incredibly valuable to those of us who use it.