Mercurial > hg
comparison contrib/mergetools.hgrc @ 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 | 864bc2f4279b |
| children |
comparison
equal
deleted
inserted
replaced
| 22895:dfa44e25bb53 | 22896:7e9cbb9c6053 |
|---|