Mercurial > public > mercurial-scm > hg

diff tests/test-subrepo-svn.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 7a9cbb315d84
children c63a09b6b337
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t	Wed Oct 01 01:04:18 2014 +0200
+++ b/tests/test-subrepo-svn.t	Wed Oct 01 01:08:17 2014 +0200
@@ -322,8 +322,7 @@
    subrepository s diverged (local revision: 2, remote revision: 3)
   (M)erge, keep (l)ocal or keep (r)emote? m
    subrepository sources for s differ
-  use (l)ocal source (2) or (r)emote source (3)?
-   l
+  use (l)ocal source (2) or (r)emote source (3)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   2+
@@ -354,8 +353,7 @@
    subrepository s diverged (local revision: 3, remote revision: 2)
   (M)erge, keep (l)ocal or keep (r)emote? m
    subrepository sources for s differ (in checked out version)
-  use (l)ocal source (1) or (r)emote source (2)?
-   l
+  use (l)ocal source (1) or (r)emote source (2)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1+
@@ -378,8 +376,7 @@
    subrepository s diverged (local revision: 3, remote revision: 3)
   (M)erge, keep (l)ocal or keep (r)emote? m
    subrepository sources for s differ
-  use (l)ocal source (1) or (r)emote source (3)?
-   l
+  use (l)ocal source (1) or (r)emote source (3)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   2+