# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1159770989 -7200
# Node ID 403ebd4d92d79a8a5c8a93f7aa2e7ba59dcd849b
# Parent  325278542ea8f645bf37251f29ab440b968c92af
test-merge-revert2 solaris fix

diff -r 325278542ea8 -r 403ebd4d92d7 tests/test-merge-revert2
--- a/tests/test-merge-revert2	Sat Sep 30 21:32:29 2006 -0700
+++ b/tests/test-merge-revert2	Mon Oct 02 08:36:29 2006 +0200
@@ -27,8 +27,7 @@
 hg update -C 0
 echo "changed file1 different" >> file1
 HGMERGE=merge hg update
-#hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
-hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
+hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
 hg status
 hg id
 hg revert --no-backup --all