Re: What's cooking in git.git (Dec 2010, #04; Mon, 13)
- From
Sverre Rabbelier <srabbelier@gmail.com>
- Date
- Dec 13, 2010, 08:42 UTC
- Message-ID
- <AANLkTikuahTgKb84bX18m62XHN4Rskkg8_D7fxTsg7RR@mail.gmail.com>
- In-Reply-To
- <7v7hfe5awz.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Dec 13, 2010 at 09:34, Junio C Hamano <gitster@pobox.com> wrote:
> * ab/i18n (2010-10-07) 161 commits
[snip]
> It is getting ridiculously painful to keep re-resolving the conflicts with > other topics in flight, even with the help with rerere. > > Needs a bit more minor work to get the basic code structure right.
Can we perhaps get this into such a shape that it can be merged to next as the first order of business after the next release?
-- Cheers, Sverre Rabbelier