Mercurial > hg
comparison tests/test-context.py @ 27267:d6859d86a5d5
merge.graft: add option to keep second parent
Currently merge.graft re-writes the dirstate so only a single
parent is kept. For some cases, like evolving a merge commit,
this behaviour is not desired. More specifically, this is
needed to fix issue4389.
| author | Andrew Halberstadt <ahalberstadt@mozilla.com> |
|---|---|
| date | Thu, 03 Dec 2015 23:01:59 -0500 |
| parents | 01489fa0bbbe |
| children | 5edde05ff58e |
comparison
equal
deleted
inserted
replaced
| 27266:4dccc37b87bd | 27267:d6859d86a5d5 |
|---|