t / t5100 / msg0015on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1- a list
   2  - of stuff