From: Jeff Enderwick <jeff.enderwick@gmail.com>
Date: Wed, 12 Aug 2009 21:05:06 GMT
Subject: situation codes (e.g. #16) in unpack-trees.c
Message-ID: <bb6059c00908121405t4f34c50eo532b928fa6d6f89c@mail.gmail.com>

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?

TIA,
Jeff