Re: [PATCH v4 0/2] Fix scissors bug during merge conflict

[Junio C Hamano]

Denton Liu <liu.den...@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.