Mercurial > hg

comparison tests/test-largefiles-update.t @ 42588:f6540aba8e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 421fdf30c37c
children dc5e5577af39
comparison
equal deleted inserted replaced
42587:421fdf30c37c 42588:f6540aba8e3e
543 > r 543 > r
544 > l 544 > l
545 > l 545 > l
546 > EOF 546 > EOF
547 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) 547 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
548 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m 548 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
549 what do you want to do? m
549 subrepository sources for sub differ (in checked out version) 550 subrepository sources for sub differ (in checked out version)
550 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r 551 you can use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9).
552 what do you want to do? r
551 remote turned local largefile large2 into a normal file 553 remote turned local largefile large2 into a normal file
552 keep (l)argefile or use (n)ormal file? l 554 keep (l)argefile or use (n)ormal file? l
553 largefile large1 has a merge conflict 555 largefile large1 has a merge conflict
554 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 556 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
555 you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b. 557 you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.