Re: git tag in localversion

From: Dmitry Torokhov
Date: Mon Sep 12 2005 - 18:25:46 EST


On 9/12/05, Andrea Arcangeli <andrea@xxxxxxxxxxxx> wrote:
> On Mon, Sep 12, 2005 at 04:31:24PM -0500, Dmitry Torokhov wrote:
> > I think this question better be addressed to Ian or Sam (Andrea, did
> > you pick a wrong entry from your address book?), adding them to CC...
>
> hmm, if you're not the right person it means hg log -p has some
> problem... this changeset was submitted by you according to mercurial.
>
> http://kernel.org/hg/linux-2.6/?cmd=changeset;node=3c0ba37caa9aa696f87eaaee6ccd2a70aba78034
>

This is just a merge changeset. I was pulling from Linus and there
were conflicts so I had to do manual merge and apparently this is what
was produced.

--
Dmitry
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/