Mercurial > evolve

comparison tests/test-topic-rebase.t @ 4413:2360a1e050a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: pin the public cset to local side in merging when solving public div While working on public divergence, I think it would be better to pin the public cset to local side of merge for understanding and handling the future cases without any ambiguity. Changes in tests reflect the changed behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 25 Feb 2019 22:50:24 +0530
parents fb4801478d5d
children 9c025ec4af88 0d65a5e96691
comparison
equal deleted inserted replaced
4412:dcbe64c954dc 4413:2360a1e050a6