annotate tests/binfile.bin @ 18605:bcf29565d89f

manifestmerge: pass in branchmerge and force separately This will be used in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 08 Feb 2013 15:23:23 +0000
parents 751df21dad72
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3368
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 1790
diff changeset
1 (binary:application/octet-stream)