Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 46517:62a0b5daa15f
diff: suppress `merging foo` output lines when performing a merge diff
Differential Revision: https://phab.mercurial-scm.org/D9939
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 01 Feb 2021 11:57:18 -0500 |
| parents | 1a7d12c82057 |
| children | d57e607d9e33 |
comparison
equal
deleted
inserted
replaced
| 46516:1a7d12c82057 | 46517:62a0b5daa15f |
|---|---|
| 2574 b'forcemerge', | 2574 b'forcemerge', |
| 2575 ): b'internal:merge3-lie-about-conflicts', | 2575 ): b'internal:merge3-lie-about-conflicts', |
| 2576 }, | 2576 }, |
| 2577 b'diff --merge', | 2577 b'diff --merge', |
| 2578 ): | 2578 ): |
| 2579 repo.ui.pushbuffer() | |
| 2579 mergemod.merge(pctx2, wc=wctx) | 2580 mergemod.merge(pctx2, wc=wctx) |
| 2581 repo.ui.popbuffer() | |
| 2580 ctx1 = wctx | 2582 ctx1 = wctx |
| 2581 else: | 2583 else: |
| 2582 ctx1 = ctx2.p1() | 2584 ctx1 = ctx2.p1() |
| 2583 elif from_rev or to_rev: | 2585 elif from_rev or to_rev: |
| 2584 repo = scmutil.unhidehashlikerevs( | 2586 repo = scmutil.unhidehashlikerevs( |