Junio C Hamano <junkio@xxxxxxx> wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: [...] > > 5. Hunk header is also modified: in ordinary diff we have > > ... > > It might be not obvoious that we have (number of parents + 1) '@' > > characters in chunk header for combined dif format. > Correct. This was done to prevent people from accidentally > feeding it to "patch -p1". In other words, we wanted to make it > so obvious that it is _not_ a patch. It isn't, really... perhaps it should be made /more/ obvious (not use @ but e.g. &, ...)? -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 2654431 Universidad Tecnica Federico Santa Maria +56 32 2654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 2797513 - 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