D3984: merge: do the trivial resolution after updating sparse checkout

Yuya Nishihara yuya at tcha.org
Tue Jul 31 09:25:05 EDT 2018


I didn't come up with an example where d/c or c/d conflicts resolved by
`_resolvetrivial()` had to be fixed up by `_forgetremoved()`.

Queued for stable, thanks.


More information about the Mercurial-devel mailing list