Mercurial > evolve

diff tests/test-evolve-phase-divergence.t @ 4418:0ec30a7d9e12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add a test in pubdiv where only merging leads to conflict Added a test in public divergence where both the cset are on the different parent and no conflict in relocation but in merging.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 02 Mar 2019 02:34:29 +0530
parents 5300be965515
children 2cbb9914d227 ab5bc57ba897 2db0aca03a88
line wrap: on
line diff