Mercurial > evolve
annotate debian/source/format @ 3804:509b1e66f0b9
tests: add tests for resolving content-divergence with parent change
This patch adds a new test file test-evolve-content-divergence.t which tests the
resolution of content divergence when the divergent changesets does not have the
same parents.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 01 Jun 2018 19:57:19 +0530 |
parents | 0021301f7fde |
children |
rev | line source |
---|---|
755
0021301f7fde
debian: add source/format file
Faheem Mitha <faheem@faheem.info>
parents:
diff
changeset
|
1 3.0 (quilt) |