Johannes Schindelin a écrit : > > So what about > > <<<<<<< This hunk contains ===== > anythin > ======= > > Hello > ======= > somethin else > >>>>>>> problem! > > > If you fix it, I think you should do it properly, and analyze the index. If I read the code correctly, this case is not a problem at all because what is important is the content between <<< and >>> : even if you match the wrong === marker, you will match the first one only, then parsing will success and preimage file will be OK. Also because we always match in the same order the sha1 will be the same. Anyway, I do not know how to match the right === marker. 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
