The visual diff tool gets support for Finder integration in Lion and Snow Leopard through the Services menu and SureMerge Promote, which "adds intelligence to SureMerge which will auto merge changes that would be treated as an Attention (conflict) otherwise."
