Mercurial > public > mercurial-scm > hg

diff tests/test-largefiles-misc.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 4d4842445afc
children 76d32a0edbc6
line wrap: on
line diff
--- a/tests/test-largefiles-misc.t	Sun Jun 30 18:32:43 2019 +0900
+++ b/tests/test-largefiles-misc.t	Mon Jun 24 16:00:39 2019 -0700
@@ -957,8 +957,8 @@
   $ hg merge
   largefile f-different has a merge conflict
   ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
-  keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or
-  take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l
+  you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a.
+  what do you want to do? l
   getting changed largefiles
   1 largefiles updated, 0 removed
   0 files updated, 4 files merged, 0 files removed, 0 files unresolved