mergetools / gvimdiff2on commit cat-file: teach cat-file a '--allow-unknown-type' option (39e4ae3)
   1. "$MERGE_TOOLS_DIR/vimdiff"