tree 53ba7d1e7ec1d5a0eb90c2a6336b4071742f57bc
parent adbb569fe9a64ad9bce3b53a77f1bc39ef31f682
parent b4e29b5e63e4cd93d4244e7a52f772a40f9a7772
author Anthony Sottile <asottile@umich.edu> 1464289363 -0700
committer Anthony Sottile <asottile@umich.edu> 1464289363 -0700

Merge pull request #116 from pre-commit/check_merge_conflict_binary_files

Fix check-merge-conflict against binary files