Mercurial > hg
comparison mercurial/shelve.py @ 48589:a51c522c0064
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 18 Jan 2022 15:04:55 -0800 |
parents | 6ecd0980d7f9 |
children | bcc4820242cf |
comparison
equal
deleted
inserted
replaced
48588:402a6b6173e9 | 48589:a51c522c0064 |
---|