t / t5100 / msg0015on commit git merge -X<option> (8cc5b29)
   1- a list
   2  - of stuff