Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D7.t @ 5513:a8c21707e9c4
evolve: add test to show broken --continue case of content divergence
This test case demonstrates that during the resolution of content
divergence which includes relocation of "divergent" side but not
"other" and results in merge conflict during relocation, we can
lose some changes.
Next patch will fix this bug.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 05 Aug 2020 00:16:26 +0530 |
| parents | 196ed65594dc |
| children | 8d20c0af010a fc60328270ac |
comparison
equal
deleted
inserted
replaced
| 5510:9fef6f8790a5 | 5513:a8c21707e9c4 |
|---|