From: Jeff King <peff@peff.net>
Date: Wed, 12 Aug 2009 21:07:27 GMT
Subject: Re: situation codes (e.g. #16) in unpack-trees.c
Message-ID: <20090812210726.GA16640@coredump.intra.peff.net>
In-Reply-To: <bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com>

On Wed, Aug 12, 2009 at 02:05:06PM -0700, Jeff Enderwick wrote:

> Newbie here. I'm trying to grok git's merge algorithms. Where are
> those '#' codes written up (e.g. #16, #5ALT, etc)?
> Is there a write-up anywhere on the merge logic?

Try Documentation/technical/trivial-merge.txt.

-Peff