rails/rails — pull request #7392 by ernie (2012-08-19 12:08:11+00:00)
Title: Fix "last equality wins" logic in relation merge

This is a real fix (as compared to the band-aid in b127d86c), which uses
the recently-added equality methods for ARel nodes. It has the side
benefit of simplifying the merge code a bit.