t / t5100 / emptyon commit merge: introduce merge.ff configuration variable (f23e8de)
   1