Mercurial > hg
comparison tests/test-conflict.t @ 41082:4d40f6bb4cef
exthelper: switch to using the registrar merging method
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 30 Dec 2018 22:46:54 -0500 |
| parents | fd805a44b89d |
| children | 7315464f0613 |
comparison
equal
deleted
inserted
replaced
| 41081:13f50ea8ac3b | 41082:4d40f6bb4cef |
|---|