[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Andreas Schwab
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 11:19:03 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

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?

> Which is not true for Mark's merge.

Both commits merge trunk into a branch.  How are they different?


Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

[Prev in Thread] Current Thread [Next in Thread]