Mercurial > hg
view mercurial/__init__.py @ 48509:5151b0f6519e
simplemerge: make `localorother` a "mode" instead of a separate thing
`simplemerge()` takes a `mode` argument, which can be "union", "merge"
or "mergediff", and a `localorother` argument, which can be `None`,
"local", or "other". The two options are not at all orthogonal -- most
combinations don't make sense. Also, at least "union", "local", and
"other" are very closely related. Therefore, it makes sense to combine
them into one.
It probably makes sense to split the `mode` argument into `resolve`
and `marker_style`, where the former can be `None`, "union", "local",
or "other", and the latter can be "merge", "merge3", "mergediff", or
"minimize". This is a good step in that direction whether or not we
end up doing that.
Differential Revision: https://phab.mercurial-scm.org/D11887
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 07 Dec 2021 17:48:50 -0800 |
parents | d783f945a701 |
children | 6000f5b25c9b |
line wrap: on
line source
# __init__.py - Startup and module loading logic for Mercurial. # # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import # Allow 'from mercurial import demandimport' to keep working. import hgdemandimport demandimport = hgdemandimport