Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo-git.t @ 22590:d4c972b97fee
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 | 2d86f4e38c08 |
line wrap: on
line diff
--- a/tests/test-subrepo-git.t Wed Oct 01 01:04:18 2014 +0200 +++ b/tests/test-subrepo-git.t Wed Oct 01 01:08:17 2014 +0200 @@ -467,8 +467,7 @@ subrepository s diverged (local revision: da5f5b1, remote revision: aa84837) (M)erge, keep (l)ocal or keep (r)emote? m subrepository sources for s differ - use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? - l + use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? l 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n 4+ @@ -494,8 +493,7 @@ subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) (M)erge, keep (l)ocal or keep (r)emote? m subrepository sources for s differ (in checked out version) - use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? - l + use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n 1+ @@ -517,8 +515,7 @@ subrepository s diverged (local revision: 32a3438, remote revision: 32a3438) (M)erge, keep (l)ocal or keep (r)emote? m subrepository sources for s differ - use (l)ocal source (32a3438) or (r)emote source (32a3438)? - l + use (l)ocal source (32a3438) or (r)emote source (32a3438)? l 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n 7+