comparison hgext/largefiles/overrides.py @ 42587:421fdf30c37c

largefiles: make last line of prompts <40 english chars (issue6158)

Differential Revision: https://phab.mercurial-scm.org/D6571

42586:cad3dde7a573

    if (ohash != ahash and
        ohash != dhash and
        (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?'
               '$$ &Local $$ &Other') %
               (lfutil.splitstandin(orig), ahash, dhash, ohash),
             0) == 1)):
        repo.wwrite(fcd.path(), fco.data(), fco.flags())
    return True, 0, False

42587:421fdf30c37c

    if (ohash != ahash and
        ohash != dhash and
        (dhash == ahash or
         repo.ui.promptchoice(
             _('largefile %s has a merge conflict\nancestor was %s\n'
               '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)):
        repo.wwrite(fcd.path(), fco.data(), fco.flags())
    return True, 0, False