Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-A6.t @ 4636:c0e9a3c01c44
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 | 21f06d932231 |
| children | 2280461343e5 62b60fc1983d |