Re: [PATCH] merge-recursive: separate message for common ancestors

From: Jiang Xin <worldhello.net@gmail.com>
Date: Aug 6, 2012, 17:04 UTC
Message-ID: <CANYiYbE-q82-BmbQ15o8S=0mS2GgURZ1qpX6E1NG80ZNgax_ow@mail.gmail.com>
In-Reply-To: <CANYiYbFe6LUL+2m-X+Ek8ehFw6D5tvh+FwoGjF_zipcUe_MtMw@mail.gmail.com>

2012/8/6 Jiang Xin <worldhello.net@gmail.com>:

Show 6 quoted lines

> 2012/8/6 Junio C Hamano <gitster@pobox.com>:
>> OK, so there was no hidden message behind "At least for better
>> translation".  Will apply this so 1.7.12 can have it.
>
> So I will not wait for Ralf's update on "de.po", he will catch up with next
> round of l10n with this fix. Pull request for this round of l10n:

Next round (maybe last) of translation for git v1.7.12 begins. This time only 1 message is updated in commit bb2ba06:

    l10n: Update one message in git.pot

    This update comes from commit v1.7.12-rc1-18-ge0453
    (merge-recursive: separate message for common ancestors).

    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Fetch this update from the usual place:

    $ git fetch git://github.com/git-l10n/git-po master

-- 
Jiang Xin