Re: Unexpected cherry-pick behaviour

2013-12-11 Thread Paulo Matos
st_map)) +return false; /* Now walk each statement recording any context sensitive temporary equivalences we can detect. */ -- 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

Re: Unexpected cherry-pick behaviour

2013-12-11 Thread Paulo Matos
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.o

Unexpected cherry-pick behaviour

2013-12-10 Thread Paulo Matos
ll have code outside the zone, that are _not_ part of the patch modified as well. Is this a bug or a feature? If the latter, why this behaviour and how can I avoid it? Cheers, -- 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