Mercurial > hg
comparison tests/test-parseindex2.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 | 3681de20b0a7 |
| children | b502138f5faa |
comparison
equal
deleted
inserted
replaced
| 22896:7e9cbb9c6053 | 22897:8fe74328f700 |
|---|