tests: unify test-update-renames

tests/test-update-renames.t

@@ -1,19 +1,29 b''
-#!/bin/sh
-
 # test update logic when there are renames
 
-
 # update with local changes across a file rename
-hg init a
-cd a
-echo a > a
-hg add a
-hg ci -m a
-hg mv a b
-hg ci -m rename
-echo b > b
-hg ci -m change
-hg up -q 0
-echo c > a
-hg up
-cd ..
+
+  $ hg init
+
+  $ echo a > a
+  $ hg add a
+  $ hg ci -m a
+
+  $ hg mv a b
+  $ hg ci -m rename
+
+  $ echo b > b
+  $ hg ci -m change
+
+  $ hg up -q 0
+
+  $ echo c > a
+
+  $ hg up
+  merging a and b to b
+  warning: conflicts during merge.
+  merging b failed!
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+
+  $ cd ..
+