Mercurial > evolve
view docs/commands.rst @ 5730:a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
While deciding the resolution parent for content-divergence resolution, now we
use 3-way merge logic to check, if only one of them was moved from its original
position by comparing the parent of both divergent cset with parent of base.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 22 Jan 2021 05:37:43 +0100 |
parents | 3f466d348047 |
children |
line wrap: on
line source
------------------------- Evolve Commands Reference ------------------------- .. highlight:: none amend ----- .. hghelp:: amend evolve ------ .. hghelp:: evolve fold ---- .. hghelp:: fold metaedit -------- .. hghelp:: metaedit next ---- .. hghelp:: next obslog ------ .. hghelp:: obslog pdiff ----- .. hghelp:: pdiff previous -------- .. hghelp:: previous prune ----- .. hghelp:: prune pstatus ------- .. hghelp:: pstatus split ----- .. hghelp:: split touch ----- .. hghelp:: touch uncommit -------- .. hghelp:: uncommit