Mercurial > hg
diff tests/test-duplicateoptions.py @ 45167:796b63b0f0dd
merge: refactor code to advise fsmonitor in separate function
merge.update() is quite hard to understand, found this an easy win.
The end goal is to have better organized merge and mergestate handling and then
fix some related bugs.
Differential Revision: https://phab.mercurial-scm.org/D8740
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 09 Jul 2020 19:02:10 +0530 |
| parents | 2372284d9457 |
| children | 6000f5b25c9b |