equal
deleted
inserted
replaced
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( |