Mark Thomas <mbthomas@fb.com> [Mon, 02 Oct 2017 14:05:30 -0700] rev 34551
merge: rename conflicts to fileconflicts in _checkunknownfiles
We will need to distinguish between file conflicts and path conflicts. Rename
the conflicts variable so that it will be clearly distinct from pathconflicts,
which will be introduced in a future commit.
Differential Revision: https://phab.mercurial-scm.org/D780