Mercurial > evolve
diff tests/test-prev-next.t @ 5822:bf303f93a461 stable
test-compat: back out changeset ab2c56cdfc19
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 12:06:42 +0800 |
| parents | ab2c56cdfc19 |
| children | fd039a7f0c3c 7dfb3b267070 |
line wrap: on
line diff
--- a/tests/test-prev-next.t Thu Mar 11 12:06:41 2021 +0800 +++ b/tests/test-prev-next.t Thu Mar 11 12:06:42 2021 +0800 @@ -431,7 +431,7 @@ $ hg prev abort: conflicting changes (do you want --merge?) - [20] + [255] $ echo hi > bar $ hg prev @@ -443,7 +443,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [20] + [255] Test that --merge still works fine with commands.update.check set @@ -454,7 +454,7 @@ $ hg next abort: conflicting changes (do you want --merge?) - [20] + [255] $ hg next --merge merging bar warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')