changeset 48590 | 7e503eff3c76 |
parent 48450 | b5f8d9e55d42 |
child 48698 | 937998e43e93 |
--- a/mercurial/merge.py Tue Jan 18 15:04:55 2022 -0800 +++ b/mercurial/merge.py Tue Jan 18 13:23:49 2022 -0800 @@ -2280,7 +2280,7 @@ ctx.rev(), branchmerge=False, force=False, - labels=[b'working copy', b'destination'], + labels=[b'working copy', b'destination', b'working copy parent'], updatecheck=updatecheck, wc=wc, )