>>>>> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
Darrin> Now your merge should not be blocked. No?
I figured out what you meant after I sent that first reply, but waited
for update to finish to be sure it worked before replying again.
It took about thirty minutes, and claimed that I had local changes (it
was a pristine clone) that it needed to bring forward, but it seems OK.
Now I just need to remember how to get the checked-out copy
updated from the 2.6.12 tag to current. ;)
(I'd been using hg, but www.kernel.org/hg is fubar, so I had to go
back to my cg clone.)
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html