Comment 5 for bug 161131

Revision history for this message
John A Meinel (jameinel) wrote : Re: dirstate file gets confused in merge aftermath

working on it in the associated branch