t / test9200b.pngon commit checkout --ours/--theirs: allow checking out one side of a conflicting merge (38901a4)
t/test9200b.png