mergetools / gvimdiff2on commit Merge branch 'maint' (0c91a6f)
   1. "$MERGE_TOOLS_DIR/vimdiff"