Mercurial > hg
comparison tests/bundles/issue4041.hg @ 19969:ad9db007656f stable
rebase: fix selection of base used when rebasing merge (issue4041)
Prior this changeset, rebasing a merge whose first parent was not in
the rebase lead to wrong and highly conflicting merge. See the in-line
comment for details.
Test have been updated with the data provided by the reported.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 30 Oct 2013 19:45:14 +0100 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 19968:7bec3f697d76 | 19969:ad9db007656f |
|---|---|
| 1 (binary file application/octet-stream, hash: ac996194dab73f2888a4e16374b1d3d2452a4dcd) |