t / t5100 / msg0015on commit Merge branch 'se/doc-checkout-ours-theirs' (c0b901e)
   1  - a list
   2  - of stuff