Mercurial > hg
diff tests/test-mq.t @ 22896:7e9cbb9c6053
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.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 10 Oct 2014 13:31:06 -0500 |
parents | 1dd178277cf5 |
children | 7361d8244efb |