Dear diary, on Fri, Mar 03, 2006 at 02:11:57AM CET, I got a letter where Pavel Roskin <proski@xxxxxxx> said that... > Labels on merge conflict lines have changed. There is no "git rename", > use cg-mv instead. In one case stack.h is not created, so copy > stack.h~master to stack.h before fixing it. > > Also fix comments in script.sh to use the new labels. > > Signed-off-by: Pavel Roskin <proski@xxxxxxx> Whoops, overlooked this and already fixed it on my own. Thanks anyway. > @@ -308,6 +308,7 @@ echo "Merge with 0.4" | cg-merge && shou > # Mishandled stack.h > ed Makefile < $TOP/0021-bob-alice-fixup1.ed > ed rpn.c < $TOP/0022-bob-alice-fixup2.ed > +cp stack.h~master stack.h > ed stack.h < $TOP/0023-bob-alice-fixup3.ed > cg-add stack.h Isn't it enough to just kill ~master and move ~origin there, though? -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before. - : 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