Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 46547:5aac1a1a5beb | 46548:d57e607d9e33 |
|---|---|
| 544 precheck=_mergecheck, | 544 precheck=_mergecheck, |
| 545 ) | 545 ) |
| 546 def _imerge3alwaysgood(*args, **kwargs): | 546 def _imerge3alwaysgood(*args, **kwargs): |
| 547 # Like merge3, but record conflicts as resolved with markers in place. | 547 # Like merge3, but record conflicts as resolved with markers in place. |
| 548 # | 548 # |
| 549 # This is used for `hg diff --merge` to show the differences between | 549 # This is used for `diff.merge` to show the differences between |
| 550 # the auto-merge state and the committed merge state. It may be | 550 # the auto-merge state and the committed merge state. It may be |
| 551 # useful for other things. | 551 # useful for other things. |
| 552 b1, junk, b2 = _imerge3(*args, **kwargs) | 552 b1, junk, b2 = _imerge3(*args, **kwargs) |
| 553 # TODO is this right? I'm not sure what these return values mean, | 553 # TODO is this right? I'm not sure what these return values mean, |
| 554 # but as far as I can tell this will indicate to callers tha the | 554 # but as far as I can tell this will indicate to callers tha the |