Greetings wiki developers,
  Many of you perform 3-way merge on concurrent edits with GNU diff3 of
similar line based tools.  I do it myself in Gazest.  One problem with
this approach is that, unlike computer programs, wiki pages tend to
have extremely long lines since paragraphs can be submitted without
any manual line breaks.  This makes merging suboptimal: any 2 edits in
the same paragraph will be a conflict, even if one is at the beginning
and the other at the end.

How do you guys works around this problem?  Do you automatically split
paragraphs when you save a document or just before you send it to
diff3?