Mercurial > evolve
comparison tests/test-wireproto-bundle1.t @ 3810:04fe01b0c0d0
tests: add more test of resolution of content-divergent changesets
This patch adds test of resolution of content-divergent changesets when
relocation is required and it leads to conflicts. The test shows that we are not
doing the right thing. This will be fixed in upcoming patches.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 07 Jun 2018 22:45:54 +0530 |
| parents | 8feb2cae7eae |
| children | ccfcacc5ee7c ef22eef37ecc |
comparison
equal
deleted
inserted
replaced
| 3809:f06ff8fee2f6 | 3810:04fe01b0c0d0 |
|---|