t / test9200b.pngon commit tests: document cherry-pick behavior in face of conflicts (6a84334)
t/test9200b.png