# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 2010-09-17 17:45:13
# Node ID d643ae555a4de42ca2798a43a48a7e7c2c729d0a
# Parent  4134686b83e147b70c66c3364a5c2921651818e9
# Parent  ed639917c825ca88ea738bbf940ac5d123bee806

Merge with stable

diff --git a/tests/test-eol-update.out b/tests/test-eol-update.out
--- a/tests/test-eol-update.out
+++ b/tests/test-eol-update.out
@@ -25,8 +25,8 @@ diff --git a/a.txt b/a.txt
 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 @@ diff --git a/a.txt b/a.txt
 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