tests/test-rebase-collapse

--- a/tests/test-rebase-collapse	Fri Nov 06 10:06:08 2009 +0100
+++ b/tests/test-rebase-collapse	Mon Nov 09 20:15:49 2009 +0100
@@ -130,12 +130,7 @@
 
 echo
 echo '% Rebase and collapse - E onto I'
-hg rebase -s 4 --collapse 
-
-echo '% Fix conflict and continue'
-echo 'Resolved merge' > E
-hg resolve -m E
-hg rebase -c 2>&1 | sed 's/\(saving bundle to \).*/\1/'
+hg rebase -s 4 --collapse 2>&1 | sed 's/\(saving bundle to \).*/\1/'
 
 hg glog  --template '{rev}: {desc}\n'