For good results of merging it is adviced to write text files (plain text, Wiki markup, `LaTe `_X) in darcs (and most other text related version control systems like RCS, CVS, Subversion) in a line oriented manner. That is, stay away from the 'justify paragraph' function of you editor and write your files such that each sentence has one line or is broken at sensible positions. `CategoryStyle `_