Re: Conflict on identical binary files

[Daniel Shahaf]

For the record, I also moved the test to the end of the test_list, per
a request on IRC.  That avoids renumbering all existing tests.