webkit-patch rollout should error out on conflicts
Created attachment 50757 [details] Patch
Comment on attachment 50757 [details] Patch Sad about copy/paste, but looks good.
Comment on attachment 50757 [details] Patch Where's the testing?
Committed r56032: <http://trac.webkit.org/changeset/56032>