Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
reverting a
changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
merging with changeset 2:e6c3abc120e7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
abort: invalid date: 'should fail'
transaction abort!
rollback completed
abort: date exceeds 32 bits: 100000000000000000
transaction abort!
rollback completed
abort: impossible time zone offset: 1400000
transaction abort!
rollback completed
Sun Jan 15 13:30:00 2006 +0500
Sun Jan 15 13:30:00 2006 -0800
Sat Jul 15 13:30:00 2006 +0500
Sat Jul 15 13:30:00 2006 -0700
Sun Jun 11 00:26:40 2006 -0400
Sat Apr 15 13:30:00 2006 +0200
Sat Apr 15 13:30:00 2006 +0000
Wed Feb 01 13:00:30 2006 -0500
Wed Feb 01 13:00:30 2006 +0000