Rails3 lastrebase

This is going to be deleted, but I want to view the diffs.