Mercurial > hg

comparison tests/test-largefiles-update.t @ 22590:d4c972b97fee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: remove superfluous newline from subrepo prompt
author Mads Kiilerich <madski@unity3d.com>
date Wed, 01 Oct 2014 01:08:17 +0200
parents 9ab18a912c44
children 6099b518643c
comparison
equal deleted inserted replaced
22589:9ab18a912c44 22590:d4c972b97fee
434 > l 434 > l
435 > EOF 435 > EOF
436 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) 436 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
437 (M)erge, keep (l)ocal or keep (r)emote? m 437 (M)erge, keep (l)ocal or keep (r)emote? m
438 subrepository sources for sub differ (in checked out version) 438 subrepository sources for sub differ (in checked out version)
439 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? 439 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r
440 r
441 local changed .hglf/large2 which remote deleted 440 local changed .hglf/large2 which remote deleted
442 use (c)hanged version or (d)elete? c 441 use (c)hanged version or (d)elete? c
443 remote turned local largefile large2 into a normal file 442 remote turned local largefile large2 into a normal file
444 keep (l)argefile or use (n)ormal file? l 443 keep (l)argefile or use (n)ormal file? l
445 largefile large1 has a merge conflict 444 largefile large1 has a merge conflict