##// END OF EJS Templates
dirstate: use 'm' state in otherparent to reduce ambiguity...
dirstate: use 'm' state in otherparent to reduce ambiguity In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.
Matt Mackall -
r22896:7e9cbb9c default
Show More