# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1623917910 -10800
# Node ID 7204178ac04ab2d278325c2e4f250135db58eaf7
# Parent  c0b439f142602981d9312af32c5c6eda2dd9cf6e
tests: spell out hg resolve

See previous commits for the rationale.

diff -r c0b439f14260 -r 7204178ac04a tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-content-divergent-interrupted.t	Thu Jun 17 11:18:30 2021 +0300
@@ -376,7 +376,7 @@
 this test case is mainly to test that we hit merge conlict while merging the
 two divergent csets, so resolving this one which happened during relocation
   $ echo a > a
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
diff -r c0b439f14260 -r 7204178ac04a tests/test-evolve-content-divergent-stack.t
--- a/tests/test-evolve-content-divergent-stack.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-content-divergent-stack.t	Thu Jun 17 11:18:30 2021 +0300
@@ -274,7 +274,7 @@
   (see 'hg help evolve.interrupted')
   [240]
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -303,7 +303,7 @@
   +new_file
 
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve -c
@@ -545,7 +545,7 @@
   [240]
 
   $ echo b > b
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
@@ -558,7 +558,7 @@
   [240]
 
   $ echo b > b
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
@@ -867,7 +867,7 @@
   [240]
 
   $ echo foo > b
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
diff -r c0b439f14260 -r 7204178ac04a tests/test-evolve-public-content-divergent-corner-cases.t
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Jun 17 11:18:30 2021 +0300
@@ -415,7 +415,7 @@
   +e
 
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
diff -r c0b439f14260 -r 7204178ac04a tests/test-evolve-public-content-divergent-discard.t
--- a/tests/test-evolve-public-content-divergent-discard.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-public-content-divergent-discard.t	Thu Jun 17 11:18:30 2021 +0300
@@ -287,7 +287,7 @@
   +>>>>>>> other: 229da2719b19 - test: added ch
 
   $ echo ch > ch
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -390,7 +390,7 @@
   [240]
 
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -495,7 +495,7 @@
   [240]
 
   $ echo dh > dh
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -598,7 +598,7 @@
   [240]
 
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -612,7 +612,7 @@
   [240]
 
   $ echo dh > dh
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
diff -r c0b439f14260 -r 7204178ac04a tests/test-evolve-public-content-divergent-main.t
--- a/tests/test-evolve-public-content-divergent-main.t	Thu Jun 17 11:16:53 2021 +0300
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Jun 17 11:18:30 2021 +0300
@@ -385,7 +385,7 @@
   +e
 
   $ echo c > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -495,7 +495,7 @@
   [240]
 
   $ echo d > d
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -608,7 +608,7 @@
   +e
 
   $ echo cfoo > c
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
 
@@ -622,7 +622,7 @@
   [240]
 
   $ echo d > d
-  $ hg res -m
+  $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue