mergetools / gvimdiff2on commit Sync with 1.8.1.6 (6466fbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"