Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
#!/bin/sh
hg init
echo "Is there an error message when trying to diff non-existing files?"
hg diff not found
echo "Is there an error message when trying to add non-existing files?"
hg add not found