Mercurial > hg
diff tests/test-rebase-interruptions.t @ 40864:09680349cc2d
rebase: format commit in usual way when explaining that it became empty
We use the _ctxdesc() for other similar messages, so it seems we
should use it here too.
Differential Revision: https://phab.mercurial-scm.org/D5394
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Dec 2018 14:17:09 -0800 |
| parents | 2009d84f245a |
| children | 4edd427f34c1 |
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t Mon Oct 29 21:50:53 2018 +0900 +++ b/tests/test-rebase-interruptions.t Fri Dec 07 14:17:09 2018 -0800 @@ -454,7 +454,7 @@ continue: hg rebase --continue $ hg rebase --continue rebasing 1:fdaca8533b86 "b" - note: rebase of 1:fdaca8533b86 created no changes to commit + note: rebase of 1:fdaca8533b86 "b" created no changes to commit saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg $ hg resolve --list $ test -d .hg/merge