Mercurial > hg

diff mercurial/stack.py @ 44200:fa9ad1da2e77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 687b865b95ad
children d4ba4d51f85f
line wrap: on
line diff