mergetools / vimdiff3on commit git-p4: better error reporting when p4 fails (0ef67ac)
   1. "$MERGE_TOOLS_DIR/vimdiff"