From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 09:38:20 GMT
Subject: Re: [PATCH v4 0/2] Fix scissors bug during merge conflict
Message-ID: <xmqqefbe7otv.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <cover.1542768902.git.liu.denton@gmail.com>

Denton Liu <liu.denton@gmail.com> writes:

> Changes since V3:
> 	* Add patch to cleanup 'merge --squash c3 with c7' test in t7600
> 	* Use test_i18ncmp instead of test_cmp to pass GETTEXT_POISON tests

Queued. Thanks, both.