comparison tests/test-import-git.t @ 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 8c13f7b0ace6
children 6a454e7053a1
comparison
equal deleted inserted replaced
45166:a5be403dd7a0 45167:796b63b0f0dd