t / test-binary-1.pngon commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
t/test-binary-1.png