--- a/tests/test-eol-update.out Thu Sep 16 17:51:32 2010 -0500
+++ b/tests/test-eol-update.out Fri Sep 17 12:45:13 2010 -0500
@@ -25,8 +25,8 @@
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
-first\r
-third\r
+first
+third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
@@ -57,8 +57,8 @@
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
-first\r
-third\r
+first
+third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt