Merge pull request #3564 from ethomson/merge_drivers Custom merge drivers and proper gitattributes `merge` handling
2016-03-17T18:01:37