Mercurial > hg
comparison tests/tinyproxy.py @ 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 | ca430fb6a668 |
children | 328739ea70c3 |
comparison
equal
deleted
inserted
replaced
22896:7e9cbb9c6053 | 22897:8fe74328f700 |
---|