Re: Question: start mergetool with trivial differences already handled?

On Mon, May 17, 2010 at 4:47 PM, Uri Okrent [off-list ref] wrote:

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).

Your merge tool of choice should already do this, if not, you need to
use a better merge tool.

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.

Correct.

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.

This doesn't really have anything to do with git at this point. It's
up to whatever tool mergetool invokes to perform the 3-way diff
itself. That tool should then only ask you to resolve the conflicting
regions, and all other differences should be auto resolved.

Most of the tools that mergetool supports out-of-the-box perform 3-way
diffs, so I guess I'm curious what merge tool you're using.

j.