1. 4a01f64 Fix check-merge-conflict against binary files by Anthony Sottile ยท 9 years ago