Actually, trac wiki cannot do that ;(. I had to copy&paste my text, open&edit the changed version, paste that text into it and submit. I got something like ‘You cannot submit your revision because someone else has edited this page …’.
It would be cool if trac wiki could merging, though ;).
