Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
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)