[PATCH 2 of 2 V2] dirstate: track otherparent files same as nonnormal

[Augie Fackler]

On Sun, Mar 05, 2017 at 04:51:01PM -0800, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1488761157 28800
> #      Sun Mar 05 16:45:57 2017 -0800
> # Node ID a465bc91a3c1a04c9c75a3cbd13fd5b777487de9
> # Parent  4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
> dirstate: track otherparent files same as nonnormal

Very nice. Queued.