1260                   "use (c)hanged version or (d)elete?"

  1260                   "use (c)hanged version or (d)elete?"

  1261                   "$$ &Changed $$ &Delete") % f, 0):

  1261                   "$$ &Changed $$ &Delete") % f, 0):

  1262                 actions['r'].append((f, None, "prompt delete"))

  1262                 actions['r'].append((f, None, "prompt delete"))

  1263             else:

  1263             else:

  1264                 actions['a'].append((f, None, "prompt keep"))

  1264                 actions['a'].append((f, None, "prompt keep"))

  1266 

  1265 

  1267         for f, args, msg in sorted(actions['dc']):

  1266         for f, args, msg in sorted(actions['dc']):

  1268             flags, = args

  1267             flags, = args

  1269             if repo.ui.promptchoice(

  1268             if repo.ui.promptchoice(

  1270                 _("remote changed %s which local deleted\n"

  1269                 _("remote changed %s which local deleted\n"

  1271                   "use (c)hanged version or leave (d)eleted?"

  1270                   "use (c)hanged version or leave (d)eleted?"

  1272                   "$$ &Changed $$ &Deleted") % f, 0) == 0:

  1271                   "$$ &Changed $$ &Deleted") % f, 0) == 0:

  1273                 actions['g'].append((f, (flags,), "prompt recreating"))

  1272                 actions['g'].append((f, (flags,), "prompt recreating"))

  1275 

  1273 

  1276         # divergent renames

  1274         # divergent renames

  1277         for f, fl in sorted(diverge.iteritems()):

  1275         for f, fl in sorted(diverge.iteritems()):

  1278             repo.ui.warn(_("note: possible conflict - %s was renamed "

  1276             repo.ui.warn(_("note: possible conflict - %s was renamed "

  1279                            "multiple times to:\n") % f)

  1277                            "multiple times to:\n") % f)