Mercurial > evolve

diff tests/test-amend-patch.t @ 4636:c0e9a3c01c44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: consider using three way merge to get the user for div resolution This patch adds the logic to merge the users from two divergent csets considering the base (i.e three way merge). The case when all the three are different, we concatenate the two authors of divergent csets.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sun, 05 May 2019 18:24:59 +0530
parents 96bbea985b25
children 537fd9a86c06 900668a93629
line wrap: on
line diff