Mercurial > evolve
changeset 5460:53d3c7a2265c mercurial-5.4
test-compat: back out changeset 0d65a5e96691
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 31 Jul 2020 18:09:18 +0800 |
| parents | 44d99ec38ecb |
| children | 000a6781f032 b40c9ac8b540 |
| files | tests/test-topic-rebase.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Fri Jul 31 18:03:43 2020 +0800 +++ b/tests/test-topic-rebase.t Fri Jul 31 18:09:18 2020 +0800 @@ -127,7 +127,7 @@ merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature - unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') + unresolved conflicts (see hg resolve, then hg rebase --continue) [1] Resolve the conflict