t / t4252 / file-2-0on commit merge: introduce merge.ff configuration variable (f23e8de)
   11
   22
   33
   44
   55
   66
   77