Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/tests/test-largefiles-update.t	Wed Oct 01 01:04:18 2014 +0200
+++ b/tests/test-largefiles-update.t	Wed Oct 01 01:08:17 2014 +0200
@@ -436,8 +436,7 @@
    subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
   (M)erge, keep (l)ocal or keep (r)emote? m
    subrepository sources for sub differ (in checked out version)
-  use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)?
-   r
+  use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r
   local changed .hglf/large2 which remote deleted
   use (c)hanged version or (d)elete? c
   remote turned local largefile large2 into a normal file