This is an archive of the discontinued Mercurial Phabricator instance.

merge: rename conflicts to fileconflicts in _checkunknownfiles
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:28 AM.

Details

Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:28 AM
ryanmce accepted this revision.Sep 25 2017, 3:59 PM
mbthomas updated this revision to Diff 2216.Oct 1 2017, 5:32 AM
mbthomas updated this revision to Diff 2357.Oct 2 2017, 5:15 PM
ryanmce accepted this revision.Oct 5 2017, 12:28 PM

still lookin good here

This revision was automatically updated to reflect the committed changes.