alimanfoo/petl — pull request #259 by pawl (2014-05-28 02:15:44+00:00)
Title: Show Source of Conflict

Fixes #256