Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 4576:96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 14 Apr 2019 02:18:19 +0800 |
| parents | fb8e44c70798 |
| children | 79bc0f1a832e b6c819facbe8 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Wed Apr 24 15:57:49 2019 +0200 +++ b/tests/test-stabilize-conflict.t Sun Apr 14 02:18:19 2019 +0800 @@ -77,7 +77,7 @@ dix $ hg amend 1 new orphan changesets - $ hg evolve + $ hg evolve --update move:[2] babar count up to fifteen atop:[3] babar count up to ten merging babar @@ -123,7 +123,7 @@ +ten $ hg amend 1 new orphan changesets - $ hg evolve + $ hg evolve --update move:[4] babar count up to fifteen atop:[5] babar count up to ten merging babar