On Thu, Nov 25, 2010 at 04:16, Junio C Hamano <gitster@xxxxxxxxx> wrote: > It is getting ridiculously painful to keep re-resolving the conflicts with > other topics in flight, even with the help with rerere. > > Needs a bit more minor work to get the basic code structure right. Still waiting on input about what exactly needs to be fixed. See <AANLkTikw0+FGJmj7C0B9J_3ZVXrbqCw+UzyP3sqfyVdm@xxxxxxxxxxxxxxx Is there anything else than that (the builtin.h includes) that you think needs work? -- 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