Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 27163:27b89a0957ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 13:43:55 -0800
parents 4ab69be0ea15
children 88d5db4b155c
comparison
equal deleted inserted replaced
27162:4ab69be0ea15 27163:27b89a0957ec
237 237
238 try: 238 try:
239 if fco.isabsent(): 239 if fco.isabsent():
240 index = ui.promptchoice( 240 index = ui.promptchoice(
241 _("local changed %s which remote deleted\n" 241 _("local changed %s which remote deleted\n"
242 "use (c)hanged version or (d)elete?" 242 "use (c)hanged version, (d)elete, or leave (u)nresolved?"
243 "$$ &Changed $$ &Delete") % fd, 0) 243 "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 0)
244 choice = ['local', 'other'][index] 244 choice = ['local', 'other', 'unresolved'][index]
245 elif fcd.isabsent(): 245 elif fcd.isabsent():
246 index = ui.promptchoice( 246 index = ui.promptchoice(
247 _("remote changed %s which local deleted\n" 247 _("remote changed %s which local deleted\n"
248 "use (c)hanged version or leave (d)eleted?" 248 "use (c)hanged version, leave (d)eleted, or "
249 "$$ &Changed $$ &Deleted") % fd, 0) 249 "leave (u)nresolved?"
250 choice = ['other', 'local'][index] 250 "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 0)
251 choice = ['other', 'local', 'unresolved'][index]
251 else: 252 else:
252 index = ui.promptchoice( 253 index = ui.promptchoice(
253 _("no tool found to merge %s\n" 254 _("no tool found to merge %s\n"
254 "keep (l)ocal, take (o)ther, or leave (u)nresolved?" 255 "keep (l)ocal, take (o)ther, or leave (u)nresolved?"
255 "$$ &Local $$ &Other $$ &Unresolved") % fd, 0) 256 "$$ &Local $$ &Other $$ &Unresolved") % fd, 0)