test-eol-update: record new results as correct
Changeset
0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.
Previously, it used the .hgeol contents from the working directory before the
update.
--- a/tests/test-eol-update.out Thu Sep 16 16:05:00 2010 -0500
+++ b/tests/test-eol-update.out Fri Sep 17 12:44:35 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