Mercurial > hg
diff tests/test-conflict.t @ 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 | 50de08904c63 |
children | 7e503eff3c76 |
line wrap: on
line diff