mergetools / gvimdiff2on commit Sync with 1.8.1 maintenance track (92e0d91)
   1. "$MERGE_TOOLS_DIR/vimdiff"