t / t5100 / emptyon commit merge-recursive: Fix working copy handling for rename/rename/add/add (3672c97)
   1