comparison mercurial/hbisect.py @ 44200:fa9ad1da2e77

merge: start using the per-side copy dicts The point of this patch is mostly to clarify `manifestmerge()`. I find it much easier to reason about now. Differential Revision: https://phab.mercurial-scm.org/D7990
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 23 Jan 2020 15:44:30 -0800
parents f37da59a36d9
children 9d2b2df2c2ba
comparison
equal deleted inserted replaced
44199:7f8bdee0034e 44200:fa9ad1da2e77