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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html