t / t4252 / file-1-0on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   11
   22
   33
   44
   55
   66
   77