On Mon, May 17, 2010 at 3:07 PM, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > 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. But doesn't the git-mergetool command inform the requested merge tool what it should be displaying? > That tool should then only ask you to resolve the conflicting > regions, and all other differences should be auto resolved. I haven't found this to be the case. Is there a merge tool that can do this? I had assumed that git used some magic using the project's history in order to resolve conflicts in a smart way. Will a merge tool that only has $THEIRS, $OURS, and $BASE have enough information to resolve conflicts as smart as git itself does when it produces the unmerged file in your working tree? If it isn't possible for a merge tool to do that, I guess the behavior I'm looking for would be for git to somehow inform the merge tool of how the trivial merges should be resolved, i.e., that it should tell the merge tool to "use the 'unmerged' path from working tree" that git merge (or git rebase) created. > 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. I use xxdiff or diffuse (or more frequently, vim ;)) -- Uri Please consider the environment before printing this message. http://www.panda.org/how_you_can_help/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html