• Show log

    Commit

  • Hash : a2ce19ca
    Author : Ben Straub
    Date : 2014-02-05T13:35:26

    Prevent user's merge.conflictstyle from breaking tests