D4336: merge: improve interactive one-changed one-deleted message (issue5550)

[yuja (Yuya Nishihara)]

yuja added a comment.


  >> +    "file %(fd)s was deleted in local%(l)s but was modified in other%(o)s.\n"
  >  > +    "What do you want to do?\n"
  >  >      "use (c)hanged version, (d)elete, or leave (u)nresolved?"
  > 
  > The UI consistently uses lower case sentences. While I like proper punctuation, I thought I'd point out the inconsistency in case others feel it should be changed.
  
  Perhaps "What do you want to do?" can be removed? It adds nothing useful.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4336

To: durin42, #hg-reviewers
Cc: indygreg, yuja, pulkit, mercurial-devel