diff -r 6ef3107c661e -r f2719b387380 tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t Mon Jun 11 01:38:32 2012 +0200 +++ b/tests/test-rebase-conflicts.t Mon Jun 11 01:40:51 2012 +0200 @@ -118,3 +118,4 @@ $ hg cat -r 5 common resolved merge + $ cd ..