t / t5100 / emptyon commit make "git merge-tree" a built-in (907a7cb)
   1