Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
To run the tests, do:cd tests/python run-tests.pySee http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests formore information on writing tests.