Mercurial > evolve
comparison tests/test-obsconvert.t @ 5588:5cbb1f356137
unstable-list: add split and fold in content-divergence resolution
This patch adds the current status of divergence resolution when one of
the divergent changeset is a part of split or fold.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 10 Oct 2020 22:44:24 +0530 |
| parents | 945a0989e41b |
| children | f5d472b7e800 |
comparison
equal
deleted
inserted
replaced
| 5587:c2e71fc0efeb | 5588:5cbb1f356137 |
|---|