Mercurial > hg
view tests/test-symlink-os-yes-fs-no.py.out @ 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 | 89630d0b3e23 |
children |
line wrap: on
line source
adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved