phingofficial/phing — pull request #255 by marcospassos (2013-12-12 12:55:39+00:00)
Title: Add support to 'theirs' merging strategy

This PR adds support to the `theirs` merging strategy.