ryanmce added inline comments.
INLINE COMMENTS
> martinvonz wrote in filemerge.py:755-756
> nit: Is the default used only with non-interactive ui? If it also works as a
> default that lets the user just press enter to choose Yes, I'd expect the
> "yn" to be "Yn"
I followed the pattern seen elsewhere in this file.
If you just hit enter, you do get the default, though.
I can follow-up with a patch to fix all of these unclear prompts if there are
no objections... (after the freeze of course)
> filemerge.py:775-776
> checked = True
> if ui.promptchoice(_("was merge of '%s' successful (yn)?"
> "$$ &Yes $$ &No") % fd, 1):
> r = 1
See here
> filemerge.py:783-785
> if ui.promptchoice(_(" output file %s appears unchanged\n"
> "was merge successful (yn)?"
> "$$ &Yes $$ &No") % fd, 1):
And here
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D932
To: ryanmce, #hg-reviewers, krbullock, mbthomas, durin42
Cc: martinvonz, durin42, krbullock, pulkit, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
