From: Peter Oberndorfer <kumbayo84@arcor.de>
Date: Mon, 11 Apr 2011 17:12:47 GMT
Subject: textconv not invoked when viewing merge commit
Message-ID: <201104111912.47547.kumbayo84@arcor.de>

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