mergetools / gvimdiff3on commit Sync with 2.5.1 (aecce6d)
   1. "$MERGE_TOOLS_DIR/vimdiff"