On Mon, Nov 13, 2017 at 2:57 PM, Elijah Newren <newren@xxxxxxxxx> wrote: > > Perhaps: > > If 'before' is renamed to 'after' then src_entry will contain > the versions of 'before' from the merge_base, HEAD, and MERGE in > stages 1, 2, and 3; and dst_entry will contain the respective versions of > 'after' in corresponding locations. Thus, we have a total of six modes > and oids, though some will be null. (Stage 0 is ignored; we're interested > in handling conflicts.) I find that much easier to read, though I am biased with prior knowledge now. ;)
