Commit a2ce19ca68e060838ec08d7f3e0c35160a2b6697

Ben Straub 2014-02-05T13:35:26

Prevent user's merge.conflictstyle from breaking tests