# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2012-07-04 22:35:42
# Node ID 722fd97f6645da5068b6a07f8cf0cdd7c80d924f
# Parent  7ba2b9435da9f1e562bcdda837be16b2af992d83

tests: fix test markup in test-merge-types.t

ca5cc2976574 introduced some tests that because of incorrect indentation wasn't
run.

diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -72,9 +72,11 @@ Symlink is other parent, executable is l
 
 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):