changeset 42587 | 421fdf30c37c |
parent 42456 | 87a34c767384 |
child 42755 | 749ef8c31187 |
--- a/hgext/largefiles/overrides.py Sun Jun 30 18:32:43 2019 +0900 +++ b/hgext/largefiles/overrides.py Mon Jun 24 16:00:39 2019 -0700 @@ -545,7 +545,8 @@ (dhash == ahash or repo.ui.promptchoice( _('largefile %s has a merge conflict\nancestor was %s\n' - 'keep (l)ocal %s or\ntake (o)ther %s?' + 'you can keep (l)ocal %s or take (o)ther %s.\n' + 'what do you want to do?' '$$ &Local $$ &Other') % (lfutil.splitstandin(orig), ahash, dhash, ohash), 0) == 1)):