mergetools / gvimdiff2on commit Merge branch 'bc/unuse-packfile' (04fbba0)
   1. "$MERGE_TOOLS_DIR/vimdiff"