Mercurial > evolve

diff Makefile @ 3829:cb45a7173e5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: factor out logic to merge branches in separate function This patch moves the logic to merge branches while resolving content-divergence to a separate function. This makes code clear and better to understand.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 15:38:43 +0530
parents b53343c8d692
children 7cdbe18838bc
line wrap: on
line diff