D6882: histedit: sniff-test for untracked file conflicts before prompting for rules

[durin42 (Augie Fackler)]

durin42 added inline comments.

INLINE COMMENTS

> martinvonz wrote in histedit.py:1989
> could you pass these as keyword arguments?

Maybe, but I'll do what happens at the other callsite.

I also cleaned up the TODO, as I figured it out with print-debugging.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6882/new/

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

To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel