diff -r a844469257b0 -r 94afd8e00c74 src/cm/views/texts.py --- a/src/cm/views/texts.py Thu Apr 15 17:21:59 2010 +0200 +++ b/src/cm/views/texts.py Fri Apr 16 10:34:54 2010 +0200 @@ -597,8 +597,10 @@ minus, plus = '
'.join(minus), '
'.join(plus) dif = diff_match_patch2() - p = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 1) - minus = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 2) + res_diff1 = dif.diff_main(minus, plus) + dif.diff_cleanupSemantic(res_diff1) + p = dif.diff_prettyHtml_one_way(res_diff1, 1) + minus = dif.diff_prettyHtml_one_way(res_diff1, 2) plus = p res.append('-%s+%s' % (minus, plus))