The default merging behavior of git is pretty good – until it blows chunks and litters your merged file with dozens of >>>> markers. I had this happen to me again this weekend, and was finally motivated to do something about it.

[snip]

sudo port install xxdiff
git config –global merge.tool xxdiff

Now files needing a merge will open in the xxdiff user interface – which is an ugly XWindows thing, but it’s powerful. I’d love to see git hook up to something like Araxis Merge or Changes (when their 2.0 version with 3-way merge comes out), but I’m not nearly motivated enough to hack around in the git source yet.