Mercurial > hg
diff tests/test-rebase-mq.t @ 46632:9989a276712f
errors: use more specific errors in rebase extension
Differential Revision: https://phab.mercurial-scm.org/D9914
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 29 Jan 2021 16:33:12 -0800 |
parents | 21733e8c924f |
children |
line wrap: on
line diff
--- a/tests/test-rebase-mq.t Mon Mar 01 16:54:51 2021 +0100 +++ b/tests/test-rebase-mq.t Fri Jan 29 16:33:12 2021 -0800 @@ -46,14 +46,14 @@ $ hg rebase -s 1 -d 3 abort: cannot rebase onto an applied mq patch - [255] + [20] Rebase - same thing, but mq patch is default dest: $ hg up -q 1 $ hg rebase abort: cannot rebase onto an applied mq patch - [255] + [20] $ hg up -q qtip Rebase - generate a conflict: