Mercurial > hg
comparison tests/test-up-local-change.t @ 44856:b7808443ed6a
mergestate: split out merge state handling code from main merge module
There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.
Differential Revision: https://phab.mercurial-scm.org/D8550
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 18 May 2020 14:59:59 -0400 |
| parents | baf3fe2977cc |
| children | c4f14db3da1d |
comparison
equal
deleted
inserted
replaced
| 44855:1d2d353e5c4a | 44856:b7808443ed6a |
|---|