Mercurial > evolve
diff tests/test-unstability-resolution-result.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 | 7a5c6109ee84 |
children | 79bc0f1a832e b6c819facbe8 |
line wrap: on
line diff
--- a/tests/test-unstability-resolution-result.t Wed Apr 24 15:57:49 2019 +0200 +++ b/tests/test-unstability-resolution-result.t Sun Apr 14 02:18:19 2019 +0800 @@ -85,7 +85,7 @@ $ echo 'a' > a $ hg amend 1 new orphan changesets - $ hg evolve + $ hg evolve --update move:[4] newer a atop:[5] changea merging a