tests/binfile.bin
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 22 Jun 2007 20:44:40 -0300
changeset 4681 dc5920ea12f8
parent 3368 751df21dad72
permissions -rw-r--r--
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3368
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 1790
diff changeset
     1
(binary:application/octet-stream)