t / test9200a.pngon commit merge-recursive: Fix spurious 'refusing to lose untracked file...' messages (f53d397)
t/test9200a.png