> I'm still having a bit of trouble merging with Masatake. The merge > pauses while processing patch-147 (the emacs tag)... I suppose if I > left it alone it would eventually grab the full emacs tree and then > patch-148 would reverse it again. > > Does anyone know if there's anything I can do on my end to tell it to > ignore patches 147 and 148? I wonder what the "correct" way of dealing > with this sort of thing is. If Masatake created another branch of his > archive, presumably we could merge from that?
It is nice if we can avoid my patch-147 from xtla easily:-P Anyway, I will create branch in soon; and report it here. Please wait. Masatake YAMATO
