comparison tests/test-narrow-expanddirstate.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 44a51c1c8e17
children 28d5e05c139a
comparison
equal deleted inserted replaced
45166:a5be403dd7a0 45167:796b63b0f0dd