Question: start mergetool with trivial differences already handled?

Hey all, just wondering if this is possible (as things stand, I don't think it is).

Basically, I'd like to be able to fire up merge tool with all the trivial merges already taken care of (since git is better than I am at resolving the trivial ones anyway).

The way I understand it, mergetool populates the merge tool with the base file (file from the common ancestor), file from ours, and file from theirs. So, when I pull up mergetool, I see all the differences in between ours and theirs, even if git knows how to resolve many of those. What I always end up doing instead is just running vi on the unmerged path in my repo since that way I only see the actual conflicts (those marked with conflict markers).

The net effect is that I almost never use mergetool, even though I would like to.

Do the various diff tools out there understand the conflict marker syntax? It would be nice to be able to just tell mergetool to visually display the "unmerged" version of the path that git dumps in your working tree. Ideally, it would be able to show ours and theirs, with all the trivial differences pre-selected as git itself would have resolved them, but that seems more pie- in-the-sky, and a lot harder to do.

Thanks!
--
  Uri

Please consider the environment before printing this message. http://www.panda.org/how_you_can_help/