Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 46548:d57e607d9e33
diff: replace --merge option by config option
I can't think of any reason you'd want to enable the merge diff on a
run-to-run basis; you'd probably either always or never want it set
(though I can't see why you'd never want it set). If you have it set,
you'll probably also want the same output in `hg log -p`
output. Having a single config option for the feature makes sense.
Differential Revision: https://phab.mercurial-scm.org/D9956
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 04 Feb 2021 13:05:51 -0800 |
| parents | 63dfaca9087f |
| children | d4ba4d51f85f |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu Dec 24 11:21:23 2020 -0500 +++ b/mercurial/filemerge.py Thu Feb 04 13:05:51 2021 -0800 @@ -546,7 +546,7 @@ def _imerge3alwaysgood(*args, **kwargs): # Like merge3, but record conflicts as resolved with markers in place. # - # This is used for `hg diff --merge` to show the differences between + # This is used for `diff.merge` to show the differences between # the auto-merge state and the committed merge state. It may be # useful for other things. b1, junk, b2 = _imerge3(*args, **kwargs)