diff MANIFEST.in @ 5551:22c82f714fe1

evolve: rename param `divergent` to `local` in a function Since it is a utility function to merge two content divergent changesets, it makes more sense to name the two changesets as "local" and "other".
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 06 Aug 2020 18:24:32 +0530
parents 9e0f91cb5242
children 7d5d9301c244
line wrap: on
line diff