diff -r 8d1ce1bda109 -r 9e4b7555d65d src/cm/views/texts.py
--- a/src/cm/views/texts.py	Tue May 31 18:03:03 2011 +0200
+++ b/src/cm/views/texts.py	Tue May 31 18:04:05 2011 +0200
@@ -562,7 +562,7 @@
     """
     Return the inner of the html table for text1 vs text2 diff
     """
-    gen = unified_diff(text1.split('\n'), text2.split('\n'), n=3)
+    gen = unified_diff(text1.replace('\r\n','\n').split('\n'), text2.replace('\r\n','\n').split('\n'), n=3)
     index = 0
     res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/<col class="diff-marker"/><col class="diff-content"/><tbody>']
     res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))