mergetools / vimdiff3on commit git-p4.py: add support for filetype change (a02b8bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"