--- a/tests/test-rename-after-merge Fri Dec 07 02:01:10 2007 -0600 +++ b/tests/test-rename-after-merge Fri Dec 07 02:01:13 2007 -0600 @@ -24,6 +24,7 @@ echo % merge repositories hg pull ../t2 hg merge +hg st echo % rename b as c hg mv b c