t / test-binary-1.pngon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
t/test-binary-1.png