t / t5100 / msg0016on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1and some content
   2