Mercurial > hg
view tests/test-simplemerge.py.out @ 22897:8fe74328f700
dirstate: merge falls through to otherparent
This lets us more correctly fix the state when we use setparents, as
demonstrated in the change in test-graft.t.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 11 Oct 2014 14:05:09 -0500 |
parents | f18830651811 |
children |
line wrap: on
line source
................ ---------------------------------------------------------------------- Ran 16 tests in 0.000s OK