Peter Oberndorfer venit, vidit, dixit 11.04.2011 19:12: > Hi, > > i currently use a textconv filter to show contents of a zip like archive in a user readable format(as a list of contained files). > > This works fine, except for merge commits. > For merge commits i see the diff of the binary contents of the file. > > Is this intentional? > git help gitattributes mentions no such limitation. > Anywhere else(gitk(on non merge commit), git gui blame) i see the the filtered textual representation of the file. > > I tried 1.7.4 msysgit and current master > > Greetings Peter textconv is applied for "diff -m" but not for combined diffs (-c, --cc) at the moment. They go through a completely different codepath, so it is expected code-wise (not a bug per se) but not ui-wise. Looking at the code and trying to dig something up atm... Michael -- 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