filecommit: don't forget the local parent on a merge with a local rename
adding dir/baradding foodir/barfooadding dir/bar_2adding foo_2dir/bar_2foo_2adding aadding cadding badding dremoving aremoving crecording removal of a as rename to b (100% similar)