tests: unify test-merge-force

tests/test-merge-force.t

@@ -1,27 +1,43 b''
-#!/bin/sh
+  $ hg init
 
-hg init repo
-cd repo
+  $ echo a > a
+  $ hg ci -qAm 'add a'
+
+  $ echo b > b
+  $ hg ci -qAm 'add b'
 
-echo a > a
-hg ci -qAm 'add a'
+  $ hg up -qC 0
+  $ hg rm a
+  $ hg ci -m 'rm a'
+  created new head
 
-echo b > b
-hg ci -qAm 'add b'
+  $ hg up -qC 1
+  $ rm a
+
+Local deleted a file, remote removed
+
+Should fail, since there are deleted files:
 
-hg up -qC 0
-hg rm a
-hg ci -m 'rm a'
+  $ hg merge
+  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+
+Should succeed with --force:
 
-hg up -qC 1
-rm a
+  $ hg -v merge --force
+  resolving manifests
+  removing a
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-echo '% local deleted a file, remote removed'
-hg merge # should fail, since there are deleted files
-hg -v merge --force
-echo % should show a as removed
-hg st
+Should show 'a' as removed:
+
+  $ hg status
+  R a
 
-hg ci -m merge
-echo % manifest. should not have a:
-hg manifest
+  $ hg ci -m merge
+
+Should not show 'a':
+
+  $ hg manifest
+  b
+