On Thu, Aug 03, 2006 at 04:38:48PM -0400, Jeff King wrote: > git-annotate on the tip of master seems to be broken for some files (but > not for others): > > $ git-describe > v1.4.2-rc2-gfba0cbd > $ make && ./git-annotate builtin-read-tree.c > parent eff97e3faeb28f6521851c1b3be1a54a2138f12a is on line 852 > Line 852, does not match: > || > | cnt++;| > 021b6e454944a4fba878651ebf9bfe0a3f6c3077 Sweet, that might be exactly the test case I need to figure out where it loses track of some lines during merges. I'll see about looking at this over the weekend. -- Ryan Anderson sometimes Pug Majere - : 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