Mercurial > hg
diff mercurial/filemerge.py @ 27163:27b89a0957ec
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 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Nov 30 11:17:18 2015 -0800 +++ b/mercurial/filemerge.py Mon Nov 30 13:43:55 2015 -0800 @@ -239,15 +239,16 @@ if fco.isabsent(): index = ui.promptchoice( _("local changed %s which remote deleted\n" - "use (c)hanged version or (d)elete?" - "$$ &Changed $$ &Delete") % fd, 0) - choice = ['local', 'other'][index] + "use (c)hanged version, (d)elete, or leave (u)nresolved?" + "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 0) + choice = ['local', 'other', 'unresolved'][index] elif fcd.isabsent(): index = ui.promptchoice( _("remote changed %s which local deleted\n" - "use (c)hanged version or leave (d)eleted?" - "$$ &Changed $$ &Deleted") % fd, 0) - choice = ['other', 'local'][index] + "use (c)hanged version, leave (d)eleted, or " + "leave (u)nresolved?" + "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 0) + choice = ['other', 'local', 'unresolved'][index] else: index = ui.promptchoice( _("no tool found to merge %s\n"