Mercurial > hg

diff tests/test-largefiles.t @ 42587:421fdf30c37c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: make last line of prompts <40 english chars (issue6158) Differential Revision: https://phab.mercurial-scm.org/D6571
author Kyle Lippincott <spectral@google.com>
date Mon, 24 Jun 2019 16:00:39 -0700
parents 823a580448d7
children 775224e26d74
line wrap: on
line diff
--- a/tests/test-largefiles.t	Sun Jun 30 18:32:43 2019 +0900
+++ b/tests/test-largefiles.t	Mon Jun 24 16:00:39 2019 -0700
@@ -1701,8 +1701,8 @@
   $ hg merge
   largefile sub/large4 has a merge conflict
   ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
-  keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
-  take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
+  you can keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928.
+  what do you want to do? l
   getting changed largefiles
   1 largefiles updated, 0 removed
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved