Hi gitsters, Stefan Monnier wrote [1]: > I can't live without conflictstyle=diff3m and I'm very happy it exists. > But it has a little problem: it uses "|||||||\n" as a separator for the > ancestor version of the text, whereas diff3 uses "||||||| <ancestorname>\n". > The difference is harmless for a human (tho the <ancestorname> can sometimes > be useful, assuming it's meaningful), but it makes some tools fail to > recognize the conflict markers properly. > So please add a " BASE" or " ANCESTOR" after the "|||||||". No opinion on this myself. I’d be interested to hear from xdiff people whether it should be easy to add the ancestor name to the output. > > Stefan > > PS: I intended to report this bug directly to the Git bug-tracker, but I was > simply unable to find it. I know I'm sometimes dense, but I did make an > honest effort to look for it. See http://thread.gmane.org/gmane.comp.version-control.git/136500 Short answer: the usual method is to report bugs to the list, preferably with a patch for t/ or even better, a fix. ;-) Jonathan [1] http://bugs.debian.org/572720 -- 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