Mercurial > hg

diff hgext/rebase.py @ 48588:402a6b6173e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12020
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 14:57:15 -0800
parents 5105a9975407
children 6000f5b25c9b
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Jan 20 11:06:52 2022 -0800
+++ b/hgext/rebase.py	Tue Jan 18 14:57:15 2022 -0800
@@ -1544,7 +1544,7 @@
         force=True,
         ancestor=base,
         mergeancestor=mergeancestor,
-        labels=[b'dest', b'source'],
+        labels=[b'dest', b'source', b'parent of source'],
         wc=wctx,
     )
     wctx.setparents(p1ctx.node(), repo[p2].node())