Mercurial > evolve
annotate .hg-format-source @ 5579:6289ddfb9d48
evolve: refactor some error raising logic in content-divergence
This patch makes sure that we raise error when it is ambiguous
for us to decide the resolution parent.
It modifies a test also to make sure that we don't loose
code coverage for some cases.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 21 Aug 2020 18:04:48 +0530 |
parents | 48b30ff742cb |
children |
rev | line source |
---|---|
4814
48b30ff742cb
python3: use format-source to run byteify-strings in .py files
Raphaël Gomès <rgomes@octobus.net>
parents:
diff
changeset
|
1 {"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"} |