Mercurial > evolve
diff tests/test-evolve-public-content-divergent-main.t @ 5964:7204178ac04a
tests: spell out hg resolve
See previous commits for the rationale.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 17 Jun 2021 11:18:30 +0300 |
| parents | b0b1ab64f6d8 |
| children | c0921b5277a0 b1d1f4ade142 |
line wrap: on
line diff
--- 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