Johannes Schindelin a écrit : > > Okay, but then the obvious question is: what do you do about "<<<<<<" > lines that are not a marker? The answer is the same. > Same remark as before: if you fix rerere, why not do it properly? If you have a better fix send a patch or at least give me some clues. Olivier. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html