Hi, Actually I'm not sure what I messed up, but I cleaned up every trace of the merge driver and re-installed it, and now it doesn't crash anymore.
Sorry for wasting your time. Rolf > Hi, > > Rolf Bjarne Kvinge wrote: >> 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], > > Could you please indicate > - Which version of git-merge-changelog.c are you using? The ones inthe > gnulib > repository have that ASSERT line at a different line number than 1469. feb2268308fe0aa483e9614c714cd66480ba033e I added a couple of prinfs which probably shifted that line a bit. > - How are you calling git-merge-changelog (options and values of environment > variables starting with "GIT"?). I can not reproduce a crash with the 3 > files > that you sent, on x86_64-linux. > - As always, also the platform, please? OpenSuse 11.0 x86. > > Thanks. > > Bruno -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
