tests/binfile.bin
author Siddharth Agarwal <sid0@fb.com>
Mon, 23 Nov 2015 13:45:56 -0800
changeset 27126 72b4e1bf8f28
parent 3368 751df21dad72
permissions -rw-r--r--
test-merge-changedelete.t: add resolve --list output We're going to move change/delete conflicts to the resolve phase, and the resolve --list output is one of the things that will be important to test.
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)