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
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to