tests: unify test-resolve

tests/test-resolve.t

@@ -1,33 +1,43 b''
-#!/bin/sh
+test that a commit clears the merge state.
 
-# test that a commit clears the merge state.
+  $ hg init repo
+  $ cd repo
+
+  $ echo foo > file
+  $ hg commit -Am 'add file'
+  adding file
 
-hg init repo
-cd repo
+  $ echo bar >> file
+  $ hg commit -Am 'append bar'
+
+
+create a second head
 
-echo foo > file
-hg commit -Am 'add file'
-
-echo bar >> file
-hg commit -Am 'append bar'
+  $ hg up -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo baz >> file
+  $ hg commit -Am 'append baz'
+  created new head
 
-echo % create a second head
-hg up -C 0
-echo baz >> file
-hg commit -Am 'append baz'
+failing merge
 
-echo % failing merge
-HGMERGE=internal:fail hg merge
+  $ HGMERGE=internal:fail hg merge
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+
+  $ echo resolved > file
+  $ hg resolve -m file
+  $ hg commit -m 'resolved'
 
-echo resolved > file
-hg resolve -m file
-hg commit -m 'resolved'
+resolve -l, should be empty
+
+  $ hg resolve -l
+
+test crashed merge with empty mergestate
 
-echo % resolve -l, should be empty
-hg resolve -l
+  $ mkdir .hg/merge
+  $ touch .hg/merge/state
 
-# test crashed merge with empty mergestate
-mkdir .hg/merge
-touch .hg/merge/state
-echo % resolve -l, should be empty
-hg resolve -l
+resolve -l, should be empty
+
+  $ hg resolve -l