From: Paulo Matos <paulo@matos-sorge.com>
Date: Wed, 11 Dec 2013 10:04:26 GMT
Subject: Re: Unexpected cherry-pick behaviour
Message-ID: <7050e7272bb83d083a56a2c391228ed8@matos-sorge.com>
In-Reply-To: <xmqqvbywts9d.fsf@gitster.dls.corp.google.com>

On 10/12/2013 19:34, Junio C Hamano wrote:
> Perhaps immediately after "cherry-pick" stopped and asked your help
> to resolve the conflicts, running
> 
> 	$ git checkout --conflicts=diff3 gcc/tree-ssa-threadedge.c
> 
> and looking at the file again may show you what is going on better.

I don't know how to interpret the fact that the line you sent (with the 
obvious --conflicts being --conflict) outputs nothing...

Any suggestions?

-- 
Paulo Matos