Mercurial > evolve

comparison tests/test-evolve-content-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 02ece0e5865e
children 62a6f8f4e694
comparison
equal deleted inserted replaced
4417:b86413cfca4a 4418:0ec30a7d9e12