--- a/mercurial/subrepo.py Mon Jun 24 16:00:39 2019 -0700
+++ b/mercurial/subrepo.py Mon Jun 24 16:01:01 2019 -0700
@@ -88,13 +88,15 @@
def _updateprompt(ui, sub, dirty, local, remote):
if dirty:
msg = (_(' subrepository sources for %s differ\n'
- 'use (l)ocal source (%s) or (r)emote source (%s)?'
+ 'you can use (l)ocal source (%s) or (r)emote source (%s).\n'
+ 'what do you want to do?'
'$$ &Local $$ &Remote')
% (subrelpath(sub), local, remote))
else:
msg = (_(' subrepository sources for %s differ (in checked out '
'version)\n'
- 'use (l)ocal source (%s) or (r)emote source (%s)?'
+ 'you can use (l)ocal source (%s) or (r)emote source (%s).\n'
+ 'what do you want to do?'
'$$ &Local $$ &Remote')
% (subrelpath(sub), local, remote))
return ui.promptchoice(msg, 0)