From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Aug 2016 15:31:43 GMT
Subject: Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits
Message-ID: <xmqqa8gbbee8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1592315356.1230893.1471443850115.JavaMail.zimbra@ensimag.grenoble-inp.fr>

Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
writes:

> Either way (3 or 4 lines) I find it strange to have both advices
> start in the same way except that one is split and not the other.

True.