git-merge-changelog crash

[Rolf Bjarne Kvinge]

Hi,

Attached are three files (o-file, a-file and b-file) which when run with 
git-merge-changelog causes an assertion in:

#3  0x08049985 in main (argc=Cannot access memory at address 0x34a6) at 
git-merge-changelog.c:1469
1469                                    ASSERT (entry_equals 
(ancestor_file.entries[i],

Note that I updated git-merge-changelog today, so the recent assert fixes 
didn't fix this issue.

I'm working on a feature branch and this happens when I cherry-pick one commit 
from that feature feature to another branch.

Rolf




-- 
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/

a-file
Description: Binary data

b-file
Description: Binary data

o-file
Description: Binary data