# HG changeset patch # User Pierre-Yves David # Date 1564399194 -7200 # Node ID 1340d6718a881c8c35bbdd02188250d9275a2ebe # Parent ff452675566c50765a525550abbc3afcd3def599 test-compat: reverte output change from 4764e8436b2a (hg-5.1) These change where applied in evolve's changeset 88c8ef4d703c. diff -r ff452675566c -r 1340d6718a88 tests/test-evolve-public-content-divergent-corner-cases.t --- a/tests/test-evolve-public-content-divergent-corner-cases.t Mon Jul 29 13:19:48 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Mon Jul 29 13:19:54 2019 +0200 @@ -417,8 +417,8 @@ $ hg evolve --continue evolving 4:e568fd1029bb "added c e" file 'd' was deleted in other but was modified in local. - You can use (c)hanged version, (d)elete, or leave (u)nresolved. - What do you want to do? u + What do you want to do? + use (c)hanged version, (d)elete, or leave (u)nresolved? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') diff -r ff452675566c -r 1340d6718a88 tests/test-prev-next.t --- a/tests/test-prev-next.t Mon Jul 29 13:19:48 2019 +0200 +++ b/tests/test-prev-next.t Mon Jul 29 13:19:54 2019 +0200 @@ -470,8 +470,8 @@ [255] $ hg prev --merge --config commands.update.check=abort file 'bar' was deleted in other [destination] but was modified in local [working copy]. - You can use (c)hanged version, (d)elete, or leave (u)nresolved. - What do you want to do? + What do you want to do? + use (c)hanged version, (d)elete, or leave (u)nresolved? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] added foo