From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2012 22:55:42 GMT
Subject: Re: [PATCH 00/66] parseopt i18n marking (again)
Message-ID: <7vk3wtgolt.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1345465975-16927-1-git-send-email-pclouds@gmail.com>

All queued; there were three commands that gained new options that
are already in flight.  If everybody agrees that it is a good idea
to mark help text in parse_options with N_(), perhaps a better
approach is to remove these three patches, queue each of them on top
of its respective topic, and have the others graduate to 'master'
early.

In any case, not a big deal to handle this kind of conflicts.

Thanks.