[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Eli Zaretskii |
Subject: |
Re: merge conlict? |
Date: |
Mon, 25 Jan 2010 13:09:00 +0200 |
> From: Andreas Schwab <address@hidden>
> Cc: address@hidden
> Date: Mon, 25 Jan 2010 11:51:19 +0100
>
> Eli Zaretskii <address@hidden> writes:
>
> >> From: Andreas Schwab <address@hidden>
> >> Cc: address@hidden, address@hidden
> >> Date: Mon, 25 Jan 2010 11:19:03 +0100
> >>
> >> Eli Zaretskii <address@hidden> writes:
> >>
> >> >> Not much different from
> >> >> eg. address@hidden
> >> >
> >> > That merge is made of Katsumi Yamaoka's changes.
> >>
> >> I don't understand that sentence. Can you clarify?
> >
> > Compare the names of committers and log messages in this:
> >
> > 99377.1.10: Katsumi Yamaoka 2010-01-21 [merge] (Score File Format): Fix
> > typo.
>
> That's not address@hidden
The one you mention was part of what I showed. This one, to be
precise:
99266.1.22: Katsumi Yamaoka 2010-01-21 [merge] Merge from mainline.
It has no deeper revisions, so I really don't see your point. If you
want to be helpful, please elaborate.
- Re: merge conlict?, (continued)
Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?,
Eli Zaretskii <=
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Andreas Schwab, 2010/01/25
Re: merge conlict?, Eli Zaretskii, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Teemu Likonen, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Andreas Schwab, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25