diff -r 9ab18a912c44 -r d4c972b97fee tests/test-largefiles-update.t --- 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