tests: fix test markup in test-merge-types.t
ca5cc2976574 introduced some tests that because of incorrect indentation wasn't
run.
--- a/tests/test-merge-types.t Wed Jul 04 12:43:13 2012 +0200
+++ b/tests/test-merge-types.t Thu Jul 05 00:35:42 2012 +0200
@@ -72,9 +72,11 @@
Update to link without local change should get us a symlink (issue3316):
- $ hg up -C 0
- $ hg up
- $ hg st
+ $ hg up -C 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg up
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg st
Update to link with local change should cause a merge prompt (issue3200):