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