Mercurial > evolve
changeset 5433:0d65a5e96691 stable
tests: new error message format for rebase
CORE-TEST-OUTPUT-UPDATE: dc5e5577af39
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 22 Jul 2020 07:41:21 +0800 |
| parents | 58b0dfc6dd52 |
| children | c161b9756053 |
| 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 Sat Jul 04 21:02:37 2020 +0800 +++ b/tests/test-topic-rebase.t Wed Jul 22 07:41:21 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