# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1347975418 -7200
# Node ID 2eac9641496dde7525293edd6cb9123886c3a11b
# Parent  741e2bef4155787543cf4515d0da290b140cea37# Parent  536fee6a54867d021789376f8254b18ddeafb29f
merge with stable

diff -r 741e2bef4155 -r 2eac9641496d tests/test-largefiles.t
--- a/tests/test-largefiles.t	Tue Sep 18 15:30:22 2012 +0200
+++ b/tests/test-largefiles.t	Tue Sep 18 15:36:58 2012 +0200
@@ -203,21 +203,21 @@
   $ cat ../hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
   200 Script output follows
-  
-  
+
+
   drwxr-xr-x sub
   -rw-r--r-- 41 large3
   -rw-r--r-- 9 normal3
-  
-  
+
+
   $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
   200 Script output follows
-  
-  
+
+
   -rw-r--r-- 41 large4
   -rw-r--r-- 9 normal4
-  
-  
+
+
   $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
 #endif
 
@@ -1179,7 +1179,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
- 
+
 exit code with nothing outgoing (issue3611)
   $ hg outgoing ../dest
   comparing with ../dest