merge conflict resolution with meld not working

[Georg]

Hi,

in a simple test case with a merge conflict, using meld 1.1.3 on FreeBSD 6.1,
I get this assertion error after saving the resolution in meld:

Traceback (most recent call last):
  File "/usr/local/lib/meld/filediff.py", line 287, in
after_text_delete_range
    self._after_text_modified(buffer, starting_at, -
self.deleted_lines_pending)
  File "/usr/local/lib/meld/filediff.py", line 236, in _after_text_modified
    change_range = self.linediffer.change_sequence( pane, startline,
sizechange, self._get_texts())
  File "/usr/local/lib/meld/diffutil.py", line 104, in change_sequence
    changes[1] = self._change_sequence(     1, sequence, startidx,
sizechange, texts)
  File "/usr/local/lib/meld/diffutil.py", line 143, in _change_sequence
    assert rangex[0] <= rangex[1] and range1[0] <= range1[1]
AssertionError
/home/hunter/gwk/tmp/gwk/hg/baz/foo.txt seems unchanged.
Was the merge successful? [y/n]


This is with Hg 0.9.

Any hints? Driver error? Does it work for anyone else?

--
Regards,
Georg.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.selenic.com/pipermail/mercurial/attachments/20060522/d8ed72e9/attachment.html