pydata/pandas — pull request #1526 by jseabold (2012-06-25 14:01:22+00:00)
Title: ENH: Add raise on conflict keyword to update

This patch will allow me to sleep better at night. Thoughts?