Mercurial > hg

diff tests/test-bookmarks-merge.t @ 45167:796b63b0f0dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8197b395710e
children 55c6ebd11cb9
line wrap: on
line diff