Mercurial > public > mercurial-scm > hg
diff tests/test-mq-subrepo.t @ 42588:f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Differential Revision: https://phab.mercurial-scm.org/D6572
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Mon, 24 Jun 2019 16:01:01 -0700 |
| parents | f802a75da585 |
| children |
line wrap: on
line diff
--- a/tests/test-mq-subrepo.t Mon Jun 24 16:00:39 2019 -0700 +++ b/tests/test-mq-subrepo.t Mon Jun 24 16:01:01 2019 -0700 @@ -270,7 +270,8 @@ $ hg qpush applying 1 subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba) - (M)erge, keep (l)ocal or keep (r)emote? m + you can (m)erge, keep (l)ocal or keep (r)emote. + what do you want to do? m 1 files updated, 0 files merged, 0 files removed, 0 files unresolved now at: 1 $ hg status -AS