Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 18543:c8ba98bf0e71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't indent "local changed %s which remote deleted" prompt It was usually not shown in a context where indentation helped readability and it was inconsistent with other prompts.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 04 Feb 2013 02:46:53 +0100
parents 46be5c9dac91
children d0a8f09a22eb
comparison
equal deleted inserted replaced
18542:46be5c9dac91 18543:c8ba98bf0e71
296 prompts.append((f, "dc")) # prompt deleted/changed 296 prompts.append((f, "dc")) # prompt deleted/changed
297 297
298 for f, m in sorted(prompts): 298 for f, m in sorted(prompts):
299 if m == "cd": 299 if m == "cd":
300 if repo.ui.promptchoice( 300 if repo.ui.promptchoice(
301 _(" local changed %s which remote deleted\n" 301 _("local changed %s which remote deleted\n"
302 "use (c)hanged version or (d)elete?") % f, 302 "use (c)hanged version or (d)elete?") % f,
303 (_("&Changed"), _("&Delete")), 0): 303 (_("&Changed"), _("&Delete")), 0):
304 act("prompt delete", "r", f) 304 act("prompt delete", "r", f)
305 else: 305 else:
306 act("prompt keep", "a", f) 306 act("prompt keep", "a", f)