t / t4101 / diff.1-0on commit merge-recursive: Defer rename/rename(2to1) handling until process_entry (461f504)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c