| commit | b64436cdda8b86cccd92e5b7c178e0d905130b28 | [log] [tgz] |
|---|---|---|
| author | Anthony Sottile <asottile@umich.edu> | Thu May 26 12:02:43 2016 -0700 |
| committer | Anthony Sottile <asottile@umich.edu> | Thu May 26 12:02:43 2016 -0700 |
| tree | 53ba7d1e7ec1d5a0eb90c2a6336b4071742f57bc | |
| parent | adbb569fe9a64ad9bce3b53a77f1bc39ef31f682 [diff] | |
| parent | b4e29b5e63e4cd93d4244e7a52f772a40f9a7772 [diff] |
Merge pull request #116 from pre-commit/check_merge_conflict_binary_files Fix check-merge-conflict against binary files