t / test-binary-2.pngon commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
t/test-binary-2.png