mergetools / gvimdiff3on commit Sync with 2.7.1 (ff4ea60)
   1. "$MERGE_TOOLS_DIR/vimdiff"