--- a/tests/test-subrepo-svn.t Mon Jun 24 16:00:39 2019 -0700
+++ b/tests/test-subrepo-svn.t Mon Jun 24 16:01:01 2019 -0700
@@ -321,9 +321,11 @@
$ cd ..
$ hg update tip
subrepository s diverged (local revision: 2, remote revision: 3)
- (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
+ you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
+ what do you want to do? m
subrepository sources for s differ
- use (l)ocal source (2) or (r)emote source (3)? l
+ you can use (l)ocal source (2) or (r)emote source (3).
+ what do you want to do? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
2+
@@ -352,9 +354,11 @@
$ cd ..
$ hg update 1
subrepository s diverged (local revision: 3, remote revision: 2)
- (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
+ you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
+ what do you want to do? m
subrepository sources for s differ (in checked out version)
- use (l)ocal source (1) or (r)emote source (2)? l
+ you can use (l)ocal source (1) or (r)emote source (2).
+ what do you want to do? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
1+
@@ -375,9 +379,11 @@
1+
$ hg update tip
subrepository s diverged (local revision: 3, remote revision: 3)
- (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
+ you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
+ what do you want to do? m
subrepository sources for s differ
- use (l)ocal source (1) or (r)emote source (3)? l
+ you can use (l)ocal source (1) or (r)emote source (3).
+ what do you want to do? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
2+
@@ -409,7 +415,8 @@
$ cd ..
$ hg update 1
subrepository s diverged (local revision: 3, remote revision: 2)
- (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
+ you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
+ what do you want to do? m
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
1+