mercurial/filemerge.py

26966:51fa43a3cd58

    the merged version."""
    ui = repo.ui
    fd = fcd.path()

    try:
        index = ui.promptchoice(_(" no tool found to merge %s\n"
                                  "keep (l)ocal or take (o)ther?"
                                  "$$ &Local $$ &Other") % fd, 0)
        choice = ['local', 'other'][index]

        if choice == 'other':

26967:7a8e9a985c3b

    the merged version."""
    ui = repo.ui
    fd = fcd.path()

    try:
        index = ui.promptchoice(_("no tool found to merge %s\n"
                                  "keep (l)ocal or take (o)ther?"
                                  "$$ &Local $$ &Other") % fd, 0)
        choice = ['local', 'other'][index]

        if choice == 'other':