diff tests/test-evolve-orphan-merge.t @ 5578:b0234a269f29

evolve: update public content divergence acc. to new behavior Now this method _pickresolutionparent() is to decide which cset would be the resolution parent and no need to update evolvestate here since we do that later.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 21 Aug 2020 16:22:24 +0530
parents 7fa4bb23a78a
children f4f2cc332bb7 e5d91fd1f319
line wrap: on
line diff