mergetools / gvimdiff3on commit t7505: style fixes (4f8cbf2)
   1. "$MERGE_TOOLS_DIR/vimdiff"