Hi, On Mon, 7 Jul 2008, Olivier Marin wrote: > From: Olivier Marin <dkr@xxxxxxxxxxx> > > When a conflicting file contains a line that begin with "=======", rerere > failed to parse conflict markers. This result to a wrong preimage file and > an unexpected error for the user. > > This patch enforce parsing rules so that markers match in the right order > and update tests to match the above fix. 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. Ciao, Dscho -- 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
