Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 34490:fcf6d1651ff3
configitems: register the 'experimental.allowdivergence' config
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:39:44 +0200 |
| parents | a57c938e7ac8 |
| children | bed1d2eaa108 |
comparison
equal
deleted
inserted
replaced
| 34489:270e344a6c74 | 34490:fcf6d1651ff3 |
|---|